Changeset 519

Timestamp:

08/26/2010 01:57:15 AM (18 months ago)

Author:

ofer

Message:

Fixes for fetch_original

Location:

trunk/WordPress/plugin/transposh

Files:

• core/utils.php (modified) (5 diffs)
• wp/transposh_db.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/core/utils.php

@@ -110 +110 @@
 
         // remove the language from the url permalink (if in start of path, and is a defined language)
+        $gluebackhome = false;
         $home_path = rtrim(parse_url($home_url, PHP_URL_PATH), "/");
         logger("home: $home_path " . $parsedurl['path'], 5);
@@ -134 +135 @@
         //$params ="";
         if ($is_edit) {
-            $params[edit] = EDIT_PARAM . '=1';
+            $params['edit'] = EDIT_PARAM . '=1';
         }
 
@@ -252 +253 @@
      */
     public static function translate_url($href, $home_url, $target_language, $fetch_translation_func) {
+        $url='';
+        $querypart='';
         // todo - check query part... sanitize
         if (strpos($href, '?') !== false) {
@@ -261 +264 @@
         foreach ($parts as $part) {
             if (!$part) continue;
-            list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array($part, $target_language));
+            list($source, $translated_text) = call_user_func_array($fetch_translation_func, array($part, $target_language));
             if ($translated_text)
                     $url .= '/' . str_replace(' ', '-', $translated_text);
             else {
                 // now the same attempt with '-' replaced to ' '
-                list($translated_text, $old_source) = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
+                list($source, $translated_text) = call_user_func_array($fetch_translation_func, array(str_replace('-', ' ', $part), $target_language));
                 //logger ($part. ' '.str_replace('-', ' ', $part).' '.$translated_text);
                 if ($translated_text)
@@ -289 +292 @@
         $url = urldecode($href);
         $url = (($pos = strpos($url, '?')) ? substr($url, 0, $pos) : $url);
+        $url2 ='';
         $parts = explode('/', $url);
         foreach ($parts as $part) {

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -221 +221 @@
         $translation = $GLOBALS['wpdb']->escape(html_entity_decode($translation, ENT_NOQUOTES, 'UTF-8'));
         // The translation might be cached (notice the additional postfix)
-        $cached = $this->cache_fetch('R_' . $translation, $lang);
-        if ($cached !== false) {
-            logger("Exit from cache: $cached", 4);
+        list($rev,$cached) = $this->cache_fetch('R_' . $translation, $lang);
+        if ($rev == 'r') {
+            logger("Exit from cache: $translation $cached", 4);
             return $cached;
         }
@@ -241 +241 @@
 
         // we can store the result in the cache (or the fact we don't have one)
-        $this->cache_store('R_' . $translation, $lang, $original, TP_CACHE_TTL);
+        $this->cache_store('R_' . $translation, $lang, array('r',$original), TP_CACHE_TTL);
 
         logger("Exit: $translation/$original", 4);
@@ -400 +400 @@
 
         // check params
-        logger("Enter " . __FILE__ . " Params: $original , $translation, $lang, $ref", 3);
+        logger("Enter " . __FILE__ . " Params: $original , $lang, $ref", 3);
         if (!isset($original) || !isset($lang)) {
             logger("Enter " . __FILE__ . " missing params: $original, $lang," . $ref, 0);