aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2009-02-04 02:42:17 +0000
committerrvelices <rv-github@modusoptimus.com>2009-02-04 02:42:17 +0000
commit52281b5f44f000ea3b10c32a7039a32669d0b47b (patch)
tree327dc0aed9a8174dfa61ff0a9b8f367c01598f68 /admin
parent9428613b2da6132ef507e92461535283d48ecdc1 (diff)
merge r3122 from trunk
- removed second parameter $type from function format_date git-svn-id: http://piwigo.org/svn/branches/2.0@3123 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/comments.php4
-rw-r--r--admin/intro.php2
-rw-r--r--admin/picture_modify.php3
3 files changed, 4 insertions, 5 deletions
diff --git a/admin/comments.php b/admin/comments.php
index f362f4043..bbd616982 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -139,7 +139,7 @@ SELECT c.id, c.image_id, c.date, c.author, c.content, i.path, i.tn_ext
INNER JOIN '.IMAGES_TABLE.' AS i
ON i.id = c.image_id
WHERE validated = \'false\'
- ORDER BY c.date DESC
+ ORDER BY c.date DESC
;';
$result = pwg_query($query);
while ($row = mysql_fetch_assoc($result))
@@ -160,7 +160,7 @@ while ($row = mysql_fetch_assoc($result))
'ID' => $row['id'],
'TN_SRC' => $thumb,
'AUTHOR' => trigger_event('render_comment_author', $row['author']),
- 'DATE' => format_date($row['date'],'mysql_datetime',true),
+ 'DATE' => format_date($row['date'], true),
'CONTENT' => trigger_event('render_comment_content',$row['content'])
)
);
diff --git a/admin/intro.php b/admin/intro.php
index fe87a1dc1..254896878 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -221,7 +221,7 @@ SELECT MIN(date_available)
'DB_DATE' =>
sprintf(
l10n('first element added on %s'),
- format_date($first_date, 'mysql_datetime')
+ format_date($first_date)
)
)
);
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 6b665e1b0..9e7c063f5 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -241,8 +241,7 @@ $template->assign(
'FILESIZE' => @$row['filesize'].' KB',
- 'REGISTRATION_DATE' =>
- format_date($row['date_available'], 'mysql_datetime', false),
+ 'REGISTRATION_DATE' => format_date($row['date_available']),
'AUTHOR' => isset($_POST['author']) ? $_POST['author'] : @$row['author'],