Don't pass null to the mysql error functions. Even though the PHP doc…

…umentation states a null value can be passed, a warning message is given it is passed.
osCommerce · Sep 25, 2013 · 06fc87e · 06fc87e
1 parent a0be78b
commit 06fc87e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/catalog/admin/includes/functions/database.php b/catalog/admin/includes/functions/database.php
@@ -190,10 +190,18 @@ function mysqli_connect($server, $username, $password, $database) {
     }
 
     function mysqli_connect_errno($link = null) {
+      if ( is_null($link) ) {
+        return mysql_errno();
+      }
+
       return mysql_errno($link);
     }
 
     function mysqli_connect_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }
 
@@ -212,10 +220,18 @@ function mysqli_query($link, $query) {
     }
 
     function mysqli_errno($link = null) {
+      if ( is_null($link) ) {
+        return mysql_errno();
+      }
+
       return mysql_errno($link);
     }
 
     function mysqli_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }
 

diff --git a/catalog/includes/functions/database.php b/catalog/includes/functions/database.php
@@ -176,10 +176,18 @@ function mysqli_connect($server, $username, $password, $database) {
     }
 
     function mysqli_connect_errno($link = null) {
+      if ( is_null($link) ) {
+        return mysql_errno();
+      }
+
       return mysql_errno($link);
     }
 
     function mysqli_connect_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }
 
@@ -198,10 +206,18 @@ function mysqli_query($link, $query) {
     }
 
     function mysqli_errno($link = null) {
+      if ( is_null($link) ) {
+        return mysql_errno();
+      }
+
       return mysql_errno($link);
     }
 
     function mysqli_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }
 

diff --git a/catalog/install/includes/functions/database.php b/catalog/install/includes/functions/database.php
@@ -133,10 +133,18 @@ function osc_db_install($database, $sql_file) {
 
   if ( !function_exists('mysqli_connect') ) {
     function mysqli_connect_errno($link = null) {
+      if ( is_null($link) ) {
+        return mysql_errno();
+      }
+
       return mysql_errno($link);
     }
 
     function mysqli_connect_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }
 
@@ -165,6 +173,10 @@ function mysqli_query($link, $query) {
     }
 
     function mysqli_error($link = null) {
+      if ( is_null($link) ) {
+        return mysql_error();
+      }
+
       return mysql_error($link);
     }