Changeset 398591

Timestamp:

06/18/2011 01:07:22 AM (15 years ago)

Author:

dardna

Message:

Corrected some issues with custom search base; preparing 2.5.2.

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.2
 
 Interface to customize the permalinks (author, category, archives and pagination) and htaccess file generated by Wordpress.
@@ -73 +73 @@
 == Changelog ==
 
+= 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);
+* *Fix:* get_search_query no longer empty when using custom search base.
+
 = 2.5.1 (30/05/2011) =
 * *Fix:* fixed php short tag on wp-htaccess-control-ui.php (thank you caillou!).

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.1
+Version: 2.5.2
 Author: António Andrade
 Author URI: http://dardna.com
@@ -43 +43 @@
             $WPhtc_data=get_option('WPhtc_data');
             if($_GET['s']&&$WPhtc_data['custom_search_permalink']!=''){
-                wp_redirect( home_url( $WPhtc_data['custom_search_permalink']. "/" . str_replace( array( ' ', '%20' ),  array( '+', '+' ), get_query_var( 's' ) ) ) );
-                }
+                wp_redirect( home_url( $WPhtc_data['custom_search_permalink']. "/" .  urlencode(get_query_var( 's' )) ) );
+                }
+            }
+        # return get_search_query on custom search base
+        function wphtc_get_search_query_filter($query){
+            $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]);
+                }
+            return $query;
             }
         function wphtc_check_first_run(){
@@ -545 +554 @@
     add_filter('get_pagenum_link',array($WPhtc,'wphtc_filter_get_pagenum_link'));
     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_action('admin_menu', array($WPhtc,'configure_menu'));
     add_action('sm_buildmap',array($WPhtc,'set_sm'));