Changeset 83 for trunk

Timestamp:

Feb 1, 2009, 12:20:33 AM (16 years ago)

Author:

toemon

Message:

オーバライドを有効にする条件が複雑なので、include/pluggable-override.phpがわで対応させることにした。

Location:

trunk/wp-content/plugins/xpressme

Files:

• include/pluggable-override.php (modified) (4 diffs)
• xpressme.php (modified) (1 diff)

trunk/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -114 +114 @@
 }
 
-
+if ( !function_exists('wp_check_password') ) :
 // for wordpress2.5
 function wp_check_password($password, $hash, $user_id = '') {
@@ -149 +149 @@
         return apply_filters('check_password', $check, $password, $hash, $user_id);
 }
+endif;
 
+if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location, $status = 302) {
         global $is_IIS;
@@ -172 +174 @@
         }
 }
+endif;
 
-
+if ( !function_exists('wp_hash_password') ) :
 function wp_hash_password($password) {
         global $wp_hasher;
@@ -187 +190 @@
 */
 }
-
+endif;
 // ***********************************  End Of Pluggable Function Edit (wp-include/pluggable.php) ************************************
 

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

@@ -17 +17 @@
 
 $XPressME = new XPressME_Class();
-if (is_xpress_index_page_call()){
-        require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
-}
+
+require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
+
 add_action('admin_menu', array(&$XPressME, 'add_option_page'));
 add_action('admin_head', array(&$XPressME, 'add_admin_head'));