summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-16 21:59:40 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-16 21:59:40 +0000
commit864c4066a6f9ebe6c899fc3448365c6c2348a3c8 (patch)
treebaa2925a0ae42743db92d045cf9754245d887ffd /lib
parentc3a44d2ab982c42aaece2785316416a8ea780873 (diff)
parent4d0e4f733bdfa281487f370b70f5f7440a7ef931 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib')
-rw-r--r--lib/twitterapi.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index b8357c688..6a90b4e28 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -418,7 +418,7 @@ class TwitterapiAction extends Action
function date_twitter($dt)
{
$t = strtotime($dt);
- return date("D M d G:i:s O Y", $t);
+ return date("D M d H:i:s O Y", $t);
}
// XXX: Candidate for a general utility method somewhere?