Changeset 860 for trunk/xpressme_integration_kit/include

Timestamp:

Jun 15, 2016, 9:52:13 AM (8 years ago)

Author:

toemon

Message:

PHP7 対応　Fix #431
thx nao-pon

Location:

trunk/xpressme_integration_kit/include

Files:

• memory_limit.php (modified) (4 diffs)
• oninstall.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/memory_limit.php

@@ -15 +15 @@
                 $has_xoops_db = (!empty($xoopsDB));
                 if (!$has_xoops_db) {
-                        $cn = mysql_connect($xoops_config->xoops_db_host, $xoops_config->xoops_db_user, $xoops_config->xoops_db_pass);
+                        $cn = mysqli_connect($xoops_config->xoops_db_host, $xoops_config->xoops_db_user, $xoops_config->xoops_db_pass);
                         if ($cn){
-                                $db_selected = mysql_select_db($xoops_config->xoops_db_name, $cn);
+                                $db_selected = mysqli_select_db($cn, $xoops_config->xoops_db_name);
                         }
                 }
@@ -31 +31 @@
                 } else {
                         if ($db_selected){
-                                if($result = mysql_query($module_sql)){
-                                        $row = mysql_fetch_assoc($result);
+                                if($result = mysqli_query($cn, $module_sql)){
+                                        $row = mysqli_fetch_assoc($result);
                                         $module_id = $row['mid'];
                                 }
@@ -48 +48 @@
                         } else {
                                 if ($db_selected){
-                                        if($result = mysql_query($config_sql)){
-                                                $row = mysql_fetch_assoc($result);
+                                        if($result = mysqli_query($cn, $config_sql)){
+                                                $row = mysqli_fetch_assoc($result);
                                                 $memory = $row['conf_value'];
                                         }
@@ -56 +56 @@
                 }
                 if (!$has_xoops_db) {
-                        mysql_close($cn);
+                        mysqli_close($cn);
                 }
                 

trunk/xpressme_integration_kit/include/oninstall.php

@@ -90 +90 @@
 
         $charset_collate = '';
-        if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+        if ( version_compare($wpdb->get_var('SELECT VERSION()'), '4.1.0', '>=') ) {
                 if ( ! empty($wpdb->charset) )
                         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";