diff options
| author | nikrou <nikrou@piwigo.org> | 2010-06-25 19:45:19 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2010-06-25 19:45:19 +0000 |
| commit | d7fa727afabf29f8f14824d4b1fc2f2be65bfbc3 (patch) | |
| tree | 701dd822383a93073cb7115fb7ce491ea7aef087 /admin/intro.php | |
| parent | 6394613e9f99f466fb1ba98c95286a828a3cee36 (diff) | |
Bug 1744 fixed : Incorrect use of timezone with SQLite
Fixed anti-flood system.
Merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.1@6605 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/intro.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/intro.php b/admin/intro.php index e640feedc..112d33fe1 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -126,7 +126,7 @@ if ($conf['show_newsletter_subscription']) { $php_current_timestamp = date("Y-m-d H:i:s"); $db_version = pwg_get_db_version(); -list($db_current_timestamp) = pwg_db_fetch_row(pwg_query('SELECT CURRENT_TIMESTAMP;')); +list($db_current_date) = pwg_db_fetch_row(pwg_query('SELECT now();')); $query = ' SELECT COUNT(*) @@ -215,7 +215,7 @@ $template->assign( 'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade', 'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo', 'PHP_DATATIME' => $php_current_timestamp, - 'DB_DATATIME' => $db_current_timestamp, + 'DB_DATATIME' => $db_current_date, ) ); |