Bug 1738 fixed : merge from trunk

hour function doesn't exists for database other than mysql.

git-svn-id: http://piwigo.org/svn/branches/2.1@6579 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2010-06-22 21:01:47 +00:00
parent 7629b2723a
commit 1661af7f3f
5 changed files with 22 additions and 13 deletions
+5 -6
View File
@@ -55,7 +55,6 @@ function pwg_db_connect($host, $user, $password, $database)
}
$link->createFunction('now', 'pwg_now', 0);
$link->createFunction('hour', 'pwg_hour', 1);
$link->createFunction('unix_timestamp', 'pwg_unix_timestamp', 0);
$link->createFunction('md5', 'md5', 1);
$link->createFunction('if', 'pwg_if', 3);
@@ -514,6 +513,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
function pwg_db_get_hour($date)
{
return 'strftime(\'%H\', '.$date.')';
}
function pwg_db_get_date_YYYYMM($date)
{
return 'strftime(\'%Y%m\','.$date.')';
@@ -583,11 +587,6 @@ function pwg_now()
return date('Y-m-d H:i:s');
}
function pwg_hour($datetime)
{
return strftime('%H', $datetime);
}
function pwg_unix_timestamp()
{
return time();