Changeset 360 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme

Timestamp:

Aug 11, 2009, 4:31:35 PM (15 years ago)

Author:

toemon

Message:

WP2.1.3MEへの対応 fixed #199
但しWP2.1.3ME自体のバグ（MySQL４．１以上でEUC-JPを使用したときの文字化け）があるので注意

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme

Files:

• include/custom_functions.php (modified) (1 diff)
• include/functions_for_wp20.php (deleted)
• include/functions_for_wp_old.php (added)
• include/xpress_common_functions.php (modified) (2 diffs)
• xpressme.php (modified) (2 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -16 +16 @@
 }
 
-function xpress_is_wp20() {
+function xpress_is_wp_version($operator='==',$comp_version){
         global $xoops_config;
-        
-        return $xoops_config->is_wp20;
+        return version_compare($xoops_config->wp_version, $comp_version, $operator);
 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -250 +250 @@
                         }
                 } else {
-                        if(xpress_is_wp20()){
+                        if(xpress_is_wp_version('<','2.1')){  // Maybe, I think that it is ver2.1 or less.
                                 if (!empty($wp->matched_query) ){
                                         if (strpos($wp->matched_query,'author_name') !== false ){
@@ -303 +303 @@
         $query = preg_replace('/\s\s+/', ' ', $query);
         if (!empty($_COOKIE[$author_cookie])){
-                if(xpress_is_wp20()){
+                if(xpress_is_wp_version('<','2.1')){
                         $pattern = "WHERE.*AND\s?\(*post_author\s*=";
                         if ( preg_match ( "/".$pattern."/i", $query, $match ) ){

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php

@@ -20 +20 @@
 
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
-if ($xoops_config->is_wp20)
-        require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ;
+require_once dirname( __FILE__ ).'/include/functions_for_wp_old.php' ;
 
 function my_plugin_menu()
@@ -98 +97 @@
 add_filter('query','xpress_query_filter');
 //add_action("init", "xpress_set_author_cookie");
-if(xpress_is_wp20()){
+if(xpress_is_wp_version('<','2.1')){
         // It is called before parse_request() makes $GET. 
         add_action("query_vars", "xpress_set_author_cookie");