summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-04-17 16:47:18 +0000
committerRobin Millette <millette@controlyourself.ca>2009-04-17 16:47:18 +0000
commit2eb1eb86838b47af7305dbd21a181e63bcd58418 (patch)
tree5b0970b274b9453f4f76225783f85792b36f049a /lib
parent21873b806d6c5cf3e55ea10e49959c944f708688 (diff)
parent34d904b180e5caa17eb945292a8a64656424d5d0 (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?