Changeset 400579

Timestamp:

06/23/2011 09:17:58 PM (15 years ago)

Author:

dardna

Message:

fixed search feed using custom search base.

Location:

wp-htaccess-control/trunk

Files:

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

wp-htaccess-control/trunk/readme.txt

@@ -73 +73 @@
 == Changelog ==
 
+= 2.5.4 (23/06/2011) =
+* *Fix:* fixed search feed using custom search base.
+
 = 2.5.3 (23/06/2011) =
 * *Fix:* fixed special characters on query using custom search base as 2.5.2 did not solve it.

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.5.3
+Version: 2.5.4
 Author: António Andrade
 Author URI: http://dardna.com
@@ -49 +49 @@
                 if(strpos($_SERVER["REQUEST_URI"], $WPhtc_data['custom_search_permalink'])){
                     global $wp_query;
-                    $query=split($WPhtc_data['custom_search_permalink']."/",$_SERVER["REQUEST_URI"]);
-                    $query=urldecode($query[1]);
-                    $wp_query=new WP_Query('s='.$query );
+                    if(strpos($_SERVER["REQUEST_URI"], '/feed')){
+                        preg_match("/feed\/(feed|rdf|rss|rss2|atom)?/",$_SERVER["REQUEST_URI"], $feed);
+                        if($feed[1]){
+                            $format="&feed=".$feed[1];
+                            }
+                        else{
+                            $format="&feed=feed";
+                            }
+                        }
+                        $page_base=($WPhtc_data['cpp']!='')?$WPhtc_data['cpp']:'page';
+                        # in need of better regex
+                        if(!strpos($_SERVER["REQUEST_URI"], '/feed')&&!strpos($_SERVER["REQUEST_URI"],$page_base)){
+                            $pattern="/\/".$WPhtc_data['custom_search_permalink']."\/(.+)/";
+                            }
+                        else{
+                            $pattern="/\/".$WPhtc_data['custom_search_permalink']."\/(.+)\/feed|".$page_base."?/";
+                            }
+                        preg_match($pattern,$_SERVER["REQUEST_URI"], $matches);
+                        $wp_query=new WP_Query('s='.$matches[1].$format );
                     }
                 }
@@ -59 +75 @@
             $WPhtc_data=get_option('WPhtc_data');
             if($WPhtc_data['custom_search_permalink']!=''&&strpos($_SERVER["REQUEST_URI"], $WPhtc_data['custom_search_permalink'])){
-                $query=split($WPhtc_data['custom_search_permalink']."/",$_SERVER["REQUEST_URI"]);
-                $query=urldecode($query[1]);
-                $query=$query;
+                # in need of better regex
+                if(!strpos($_SERVER["REQUEST_URI"], '/feed')&&!strpos($_SERVER["REQUEST_URI"],$page_base)){
+                    $pattern="/\/".$WPhtc_data['custom_search_permalink']."\/(.+)/";
+                    }
+                else{
+                    $pattern="/\/".$WPhtc_data['custom_search_permalink']."\/(.+)\/feed|".$page_base."?/";
+                    }
+                preg_match($pattern,$_SERVER["REQUEST_URI"], $matches);
+                return urldecode($matches[1]);
                 }
             return $query;
+            }
+        function wphtc_search_feed_link($link){
+            $WPhtc_data=get_option('WPhtc_data');
+            if($WPhtc_data['custom_search_permalink']!=''){
+                $link=str_replace("search",$WPhtc_data['custom_search_permalink'],$link);
+                }
+            return $link;
             }
         function wphtc_check_first_run(){
@@ -565 +594 @@
     add_filter('redirect_canonical',array($WPhtc,'wphtc_filter_redirect_canonical'),10,10);
     add_filter('get_search_query',array($WPhtc,'wphtc_get_search_query_filter'),10,10);
+    add_filter('search_feed_link',array($WPhtc,'wphtc_search_feed_link'),10,10);
     add_action('admin_menu', array($WPhtc,'configure_menu'));
     add_action('sm_buildmap',array($WPhtc,'set_sm'));