Changeset 583 for trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php

Timestamp:

Apr 23, 2010, 10:49:33 AM (14 years ago)

Author:

toemon

Message:

xoops_mod_wordpress060_alphaの複製モジュールからのアップデート対応 fixes#335

File:

• trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php (modified) (6 diffs)

trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php

@@ -22 +22 @@
                         if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
                         
-                        $xpress_prefix = $mydirname;
-                        if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+                        $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
                         // query
@@ -74 +73 @@
                                         if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
                                         
-                                        $xpress_prefix = $mydirname;
-                                        if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+                                        $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
                                         // query
@@ -160 +158 @@
                         $post_id = intval( $link_id ) ;
                         $mydirname = $this->mydirname ;
-                        $xpress_prefix = $mydirname;
-                        if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+                        $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
                         
                         $db =& Database::getInstance() ;
@@ -199 +196 @@
                         if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
                         
-                        $xpress_prefix = $mydirname;
-                        if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+                        $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
                         
                         $table_term_relationships = $db->prefix($xpress_prefix."_term_relationships");
@@ -273 +269 @@
 
                         $mydirname = $this->mydirname ;
-                        $xpress_prefix = $mydirname;
-                        if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
+                        $xpress_prefix = preg_replace('/wordpress/','wp',$mydirname);
                         $d3f_forum_dir  = $this->d3forum_dirname;
                         
@@ -419 +414 @@
                 function get_wp_comment_ID($d3forum_post_ID){
                         $xp_prefix = $wpdirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-                        if ($xp_prefix == 'wordpress'){
-                                $xp_prefix = 'wp';
-                        }
+                        $xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
                         
                         $xoopsDB =& Database::getInstance();