Changeset 110

Timestamp:

03/27/2009 09:31:54 AM (3 years ago)

Author:

amir

Message:

Fixing the &/& characters within url.

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (4 diffs)
• transposh_widget.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/transposh.php

@@ -144 +144 @@
         global $home_url, $home_url_quoted, $enable_permalinks_rewrite;
 
+        $url = html_entity_decode($url, ENT_NOQUOTES);
+        
         if(!$enable_permalinks_rewrite)
         {
@@ -152 +154 @@
         if($is_edit)
         {
-                $params = EDIT_PARAM . '=1&';
+                $params = EDIT_PARAM . '=1&';
 
         }
@@ -158 +160 @@
         if($use_params_only)
         {
-                $params .= LANG_PARAM . "=$lang&";
+                $params .= LANG_PARAM . "=$lang&";
         }
         else
@@ -179 +181 @@
 
         // more cleanups
+        $url = preg_replace("/&$/", "", $url);
         $url = preg_replace("/\?$/", "", $url);
-        $url = preg_replace("/&$/", "", $url);
+                
+        $url = htmlentities($url, ENT_NOQUOTES);
+        
         return $url;
 }

trunk/WordPress/plugin/transposh/transposh_widget.php

@@ -45 +45 @@
                         $is_edit = $_POST[EDIT_PARAM];
                         $ref = rewrite_url_lang_param($ref, $lang, $is_edit);
+                        
+                        //ref is generated with html entities encoded, needs to be
+                        //decoded when used in the http header (i.e. 302 redirect)
+                        $ref = html_entity_decode($ref, ENT_NOQUOTES);
                 }