Changeset 533

Timestamp:

09/02/2010 12:38:57 AM (17 months ago)

Author:

ofer

Message:

Fixed bugs noticed by Nicholas

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (4 diffs)
• wp/transposh_db.php (modified) (4 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -134 +134 @@
         add_action('comment_post', array(&$this, 'add_comment_meta_settings'), 1);
         // comment_moderation_text - future filter TODO
-
         // full post wrapping (should happen late)
         add_filter('the_content', array(&$this, 'post_content_wrap'), 9999);
@@ -217 +216 @@
             logger('Translation completed in ' . ($end_time - $start_time) . ' seconds', 1);
         }
- 
+
         return $buffer;
     }
@@ -433 +432 @@
 
         // attempt to remove old files
-        @unlink($this->transposh_plugin_dir.'widgets/tpw_default.php');
-        @unlink($this->transposh_plugin_dir.'core/globals.php');
+        @unlink($this->transposh_plugin_dir . 'widgets/tpw_default.php');
+        @unlink($this->transposh_plugin_dir . 'core/globals.php');
 
         logger("plugin_activate exit: " . dirname(__FILE__));
@@ -619 +618 @@
         $use_params = FALSE;
         logger("got: $href", 5);
+        // fix what might be messed up
+        $href = str_replace(array(TP_GTXT_BRK, TP_GTXT_IBRK, TP_GTXT_BRK_CLOSER, TP_GTXT_IBRK_CLOSER), '', $href);
 
         // Ignore urls not from this site

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

@@ -76 +76 @@
         }
         logger("Cache fetched: $original => $cached", 4);
-        if ($cached !== null) $cached = explode('_', $cached, 2);
+        if ($cached !== null && $cached !== false)
+                $cached = explode('_', $cached, 2);
         return $cached;
     }
@@ -164 +165 @@
             $this->translations[$row['original']] = array($row['source'], stripslashes($row['translated']));
         }
-        logger('prefetched: '.count($this->translations), 5);
+        logger('prefetched: ' . count($this->translations), 5);
     }
 
@@ -221 +222 @@
         $translation = $GLOBALS['wpdb']->escape(html_entity_decode($translation, ENT_NOQUOTES, 'UTF-8'));
         // The translation might be cached (notice the additional postfix)
-        list($rev,$cached) = $this->cache_fetch('R_' . $translation, $lang);
+        list($rev, $cached) = $this->cache_fetch('R_' . $translation, $lang);
         if ($rev == 'r') {
             logger("Exit from cache: $translation $cached", 4);
@@ -241 +242 @@
 
         // we can store the result in the cache (or the fact we don't have one)
-        $this->cache_store('R_' . $translation, $lang, array('r',$original), TP_CACHE_TTL);
+        $this->cache_store('R_' . $translation, $lang, array('r', $original), TP_CACHE_TTL);
 
         logger("Exit: $translation/$original", 4);