Changeset 365151

Timestamp:

03/26/2011 03:09:27 PM (15 years ago)

Author:

dardna

Message:

pre 2.2.3

Location:

wp-htaccess-control/trunk

Files:

• readme.txt (modified) (1 diff)
• wp-htaccess-control.php (modified) (3 diffs)

wp-htaccess-control/trunk/readme.txt

@@ -70 +70 @@
 
 == Changelog ==
+
+= 2.2.3 (26/03/2011) =
+* *Fix:* Still fixing 2.2 canonical bug.
 
 = 2.2.2 (26/03/2011) =

wp-htaccess-control/trunk/wp-htaccess-control.php

@@ -4 +4 @@
 Plugin URI: http://dardna.com/wp-htaccess-control
 Description: Interface to customize the permalinks (author, category, archives and pagination) and htaccess file generated by Wordpress.
-Version: 2.2.2
+Version: 2.2.3
 Author: António Andrade
 Author URI: http://dardna.com
@@ -69 +69 @@
         # Disable canonical redirection on urls using custom pagination permalink
         function wphtc_filter_redirect_canonical($requested_url){
-            $WPhtc_data=get_option('WPhtc_data');
-            if(isset($WPhtc_data['cpp'])&&$WPhtc_data['cpp']!=''&&get_query_var('paged') > 1&&strpos($requested_url,urlencode($WPhtc_data['cpp']))){
+            global $wp;
+            $WPhtc_data=get_option('WPhtc_data');
+            if(isset($WPhtc_data['cpp'])&&$WPhtc_data['cpp']!=''&&get_query_var('paged') > 1&&preg_match("/".urlencode($WPhtc_data['cpp'])."/",$wp->request)){
                 return false;
                 }
@@ -548 +549 @@
     add_filter('author_link',array($WPhtc,'wphtc_filter_author_link'));
     add_filter('get_pagenum_link',array($WPhtc,'wphtc_filter_get_pagenum_link'));
-    add_filter('redirect_canonical',array($WPhtc,'wphtc_filter_redirect_canonical'),10,4);
+    add_filter('redirect_canonical',array($WPhtc,'wphtc_filter_redirect_canonical'),10,10);
     add_action('admin_menu', array($WPhtc,'configure_menu'));
     add_action('sm_buildmap',array($WPhtc,'set_sm'));