Changeset 400175

Timestamp:

06/23/2011 02:05:35 AM (15 years ago)

Author:

dardna

Message:

fixed special characters on query using custom search base as 2.5.2 did not solve it.

Location:

wp-htaccess-control/trunk

Files:

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

wp-htaccess-control/trunk/readme.txt

@@ -7 +7 @@
 Requires at least: 2.7
 Tested up to: 3.1.3
-Stable tag: 2.5.1
+Stable tag: 2.5.3
 
 Interface to customize the permalinks (author, category, archives and pagination) and htaccess file generated by Wordpress.
@@ -73 +73 @@
 == Changelog ==
 
+= 2.5.3 (23/06/2011) =
+* *Fix:* fixed special characters on query using custom search base as 2.5.2 did not solve it.
+
 = 2.5.2 (18/06/2011) =
 * *Fix:* fixed german umlauts and other special characters on query using custom search base (thank you for pointing it out Tatron);

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.2
+Version: 2.5.3
 Author: António Andrade
 Author URI: http://dardna.com
@@ -40 +40 @@
             }
         function wphtc_template_redirect(){
-            # redirect "?s=*" to "/search-base/*"
-            $WPhtc_data=get_option('WPhtc_data');
-            if($_GET['s']&&$WPhtc_data['custom_search_permalink']!=''){
-                wp_redirect( home_url( $WPhtc_data['custom_search_permalink']. "/" .  urlencode(get_query_var( 's' )) ) );
+            $WPhtc_data=get_option('WPhtc_data');
+            if($WPhtc_data['custom_search_permalink']!=''){
+                # redirect "?s=*" to "/search-base/*"
+                if($_GET['s']){
+                    wp_redirect( home_url( $WPhtc_data['custom_search_permalink']. "/" .  urlencode(get_query_var( 's' )) ) );
+                    }
+                # rewrite query
+                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 );
+                    }
                 }
             }
@@ -52 +61 @@
                 $query=split($WPhtc_data['custom_search_permalink']."/",$_SERVER["REQUEST_URI"]);
                 $query=urldecode($query[1]);
+                $query=$query;
                 }
             return $query;