james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge both log functions into one; simply saying that they take different numbers of arguments isn't enough...

Browse Source
This commit is contained in:
Shish 2009-07-17 01:55:07 +01:00
parent b609dfc19c
commit be5ed6272c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/database.class.php
View File

@ -97,8 +97,10 @@ class PostgreSQL extends DBEngine {
function _unix_timestamp($date) { return strtotime($date); } function _unix_timestamp($date) { return strtotime($date); }
function _now() { return date("Y-m-d h:i:s"); } function _now() { return date("Y-m-d h:i:s"); }
function _floor($a) { return floor($a); } function _floor($a) { return floor($a); }
function _log1($a) { return log($a); } function _log($a, $b=null) {
function _log2($a, $b) { return log($a, $b); } if(is_null($b)) return log($a);
else return log($a, $b);
}
function _isnull($a) { return is_null($a); } function _isnull($a) { return is_null($a); }
function _md5($a) { return md5($a); } function _md5($a) { return md5($a); }
function _concat($a, $b) { return $a . $b; } function _concat($a, $b) { return $a . $b; }
@ -112,8 +114,7 @@ class SQLite extends DBEngine {
@sqlite_create_function($db->_connectionID, 'UNIX_TIMESTAMP', '_unix_timestamp', 1); @sqlite_create_function($db->_connectionID, 'UNIX_TIMESTAMP', '_unix_timestamp', 1);
@sqlite_create_function($db->_connectionID, 'now', '_now', 0); @sqlite_create_function($db->_connectionID, 'now', '_now', 0);
@sqlite_create_function($db->_connectionID, 'floor', '_floor', 1); @sqlite_create_function($db->_connectionID, 'floor', '_floor', 1);
@sqlite_create_function($db->_connectionID, 'log', '_log1', 1); @sqlite_create_function($db->_connectionID, 'log', '_log');
@sqlite_create_function($db->_connectionID, 'log', '_log2', 2);
@sqlite_create_function($db->_connectionID, 'isnull', '_isnull', 1); @sqlite_create_function($db->_connectionID, 'isnull', '_isnull', 1);
@sqlite_create_function($db->_connectionID, 'md5', '_md5', 1); @sqlite_create_function($db->_connectionID, 'md5', '_md5', 1);
@sqlite_create_function($db->_connectionID, 'concat', '_concat', 2); @sqlite_create_function($db->_connectionID, 'concat', '_concat', 2);