Changeset 785 for trunk

Timestamp:

May 30, 2011, 11:39:07 AM (14 years ago)

Author:

toemon

Message:

XOOPS Engine でのdb_prefix取得バグ修正

File:

• trunk/xpressme_integration_kit/class/wpConfigInfo_class.php (modified) (5 diffs)

trunk/xpressme_integration_kit/class/wpConfigInfo_class.php

@@ -30 +30 @@
     {
                 global $xoopsModule;
-                $this->xoops_db_prefix = XOOPS_DB_PREFIX .'_';
-                $this->db_prefix = $this->_get_wp_db_prefix();
+                $this->xoops_db_prefix = XOOPS_DB_PREFIX . '_';
                 $this->db_name = XOOPS_DB_NAME;
                 $this->db_user = XOOPS_DB_USER;
@@ -37 +36 @@
                 $this->db_host = XOOPS_DB_HOST;
                 if(!defined('XOOPS_DB_NAME') ) $this->_get_resource_db_ini();
+                $this->db_prefix = $this->_get_wp_db_prefix();
                 $this->db_salt = (defined('XOOPS_DB_SALT')) ? XOOPS_DB_SALT : '';
                 require_once dirname( __FILE__ ).'/langInfo_class.php' ;
@@ -43 +43 @@
         function _get_wp_db_prefix(){
                 $module_name = basename(dirname(dirname(__FILE__)));
-        $module_db_prefix = XOOPS_DB_PREFIX . '_' . preg_replace('/wordpress/','wp',$module_name) . '_';
+        $module_db_prefix = $this->xoops_db_prefix . preg_replace('/wordpress/','wp',$module_name) . '_';
         return $module_db_prefix;
         }
@@ -63 +63 @@
                                 $this->db_pass = $matchs[1];
                         if (preg_match('/^\s*prefix\s*=\s*[\'"](.*)[\'"]/' ,$line,$matchs))
-                                $this->db_prefix = $matchs[1];
+                                $this->xoops_db_prefix = $matchs[1].'_';
                 }
         }
@@ -70 +70 @@
                 return $this->xoops_db_prefix;
         }
-        function get_db_prefix(){
-                return $this->db_prefix;
+        function get_db_prefix($module_dirname){
+                if (empty($module_dirname)){
+                        return $this->db_prefix;
+                } else {
+                $module_db_prefix = $this->xoops_db_prefix . preg_replace('/wordpress/','wp',$module_dirname) . '_';
+                return $module_db_prefix;               
+                }
         }
         function get_wp_db_prefix(){