Changeset 73 for trunk/WordPress/plugin/transposh/transposh.php

Timestamp:

03/19/2009 12:38:08 AM (3 years ago)

Author:

ofer

Message:

Fix the problems of special characters part#2

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -228 +228 @@
     $translated = NULL;
     logger("Enter " . __METHOD__ . ": $original", 4);
+    logger("Original was: $original", 3);
     $original = $wpdb->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
     logger("Original is: $original", 3);
@@ -393 +394 @@
 }
 
+/*
+ * Helper function for annoying strings from php escape (%u2019)
+ */
+function utf8_urldecode($str) {
+    $str = preg_replace("/%u([0-9a-f]{3,4})/i","&#x\\1;",urldecode($str));
+    return html_entity_decode($str,null,'UTF-8');;
+  }
 
 /*
@@ -422 +430 @@
     //Decode & remove already escaped character to avoid double escaping
     // TODO: remove logging?
-    logger("orig:" .$original,4);
-    $original    = $wpdb->escape(stripslashes(urldecode(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'))));
+    logger("origwas:" .$original,4);
+    $original = utf8_urldecode($original);
+    logger("orig2:" .$original,4);
+    $original    = $wpdb->escape(stripslashes(urldecode(html_entity_decode($original, null, 'UTF-8'))));
     logger("orig:" .$original,4);
     $translation = $wpdb->escape(htmlspecialchars(stripslashes(urldecode($translation))));