stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-03-10 17:05:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the mysql_xxx() override function definitions inside

Browse Source 
installer::connect(), otherwise they're defined before we call
check_environment, then we think we have mysql_query when we really
don't.
This commit is contained in:
Bharat Mediratta
2009-06-28 19:23:19 -07:00
parent 6e8a8c53e6
commit 177a854dbb
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
installer/installer.php
View File

@@ -18,31 +18,6 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
// We know that we have either mysql or mysqli. By default we use mysql functions, so if they're
// not defined then do the simplest thing which will work: remap them to their mysqli
// counterparts.
if (!function_exists("mysql_query")) {
function mysql_connect($host, $user, $pass) {
installer::$mysqli = new mysqli($host, $user, $pass);
// http://php.net/manual/en/mysqli.connect.php says to use mysqli_connect_error() instead of
// $mysqli->connect_error because of bugs before PHP 5.2.9
$error = mysqli_connect_error();
return empty($error);
}
function mysql_query($query) {
return installer::$mysqli->query($query);
}
function mysql_num_rows($result) {
return $result->num_rows;
}
function mysql_error() {
return installer::$mysqli->error;
}
function mysql_select_db($db) {
return installer::$mysqli->select_db($db);
}
}
class installer {
static $mysqli;
@@ -92,7 +67,32 @@ class installer {
}
static function connect($config) {
return @mysql_connect($config["host"], $config["user"], $config["password"]);
// We know that we have either mysql or mysqli. By default we use mysql functions, so if
// they're not defined then do the simplest thing which will work: remap them to their mysqli
// counterparts.
if (!function_exists("mysql_query")) {
function mysql_connect($host, $user, $pass) {
installer::$mysqli = new mysqli($host, $user, $pass);
// http://php.net/manual/en/mysqli.connect.php says to use mysqli_connect_error() instead of
// $mysqli->connect_error because of bugs before PHP 5.2.9
$error = mysqli_connect_error();
return empty($error);
}
function mysql_query($query) {
return installer::$mysqli->query($query);
}
function mysql_num_rows($result) {
return $result->num_rows;
}
function mysql_error() {
return installer::$mysqli->error;
}
function mysql_select_db($db) {
return installer::$mysqli->select_db($db);
}
}
return mysql_connect($config["host"], $config["user"], $config["password"]);
}
static function select_db($config) {