Changeset 497

Timestamp:

08/09/2010 03:00:31 AM (18 months ago)

Author:

ofer

Message:

APC should not be taken for granted (thanks Martin)

Location:

trunk/WordPress/plugin/transposh/wp

Files:

• transposh_backup.php (modified) (1 diff)
• transposh_db.php (modified) (3 diffs)

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

@@ -109 +109 @@
             $trans = split(',', $line);
             if ($trans[0])
-            $this->transposh->database->restore_translation($trans[0], $trans[1], $trans[2], $trans[3], $trans[4]);
+                    $this->transposh->database->restore_translation($trans[0], $trans[1], $trans[2], $trans[3], $trans[4]);
         }
-        apc_clear_cache('user'); // clean up cache so that results will actually show
+        // clean up cache so that results will actually show
+        if (ENABLE_APC && function_exists('apc_clear_cache'))
+                apc_clear_cache('user');
         exit;
     }

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

@@ -290 +290 @@
 
             // If we have caching - we remove previous entry from cache
-            if (ENABLE_APC && function_exists('apc_store')) {
+            if (ENABLE_APC && function_exists('apc_delete')) {
                 apc_delete($original . '___' . $lang);
             }
@@ -570 +570 @@
         $cleanup = 'DELETE ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE . ' ,' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG .
                 ' FROM ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE .
-                ' INNER JOIN '. $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG.
-                ' ON '.$GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE .'.original = '.$GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG .'.original'.
-                ' AND '.$GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE .'.lang = '.$GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG .'.lang'.
-                ' WHERE '. $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE.'.source > 0'.
+                ' INNER JOIN ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG .
+                ' ON ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE . '.original = ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG . '.original' .
+                ' AND ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE . '.lang = ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG . '.lang' .
+                ' WHERE ' . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE . '.source > 0' .
                 " AND timestamp < SUBDATE(NOW(),$days)";
-        apc_clear_cache('user'); // clean up cache so that results will actually show
+        // clean up cache so that results will actually show
+        if (ENABLE_APC && function_exists('apc_clear_cache'))
+                apc_clear_cache('user');
+
         $result = $GLOBALS['wpdb']->query($cleanup);
         exit;
     }
 
-    function restore_translation($original,$lang,$translation,$by,$timestamp) {
+    function restore_translation($original, $lang, $translation, $by, $timestamp) {
         // TODO in future
         // if there is a newer human translation, just ignore this
@@ -589 +592 @@
         $values .= "('" . $original . "','" . $translation . "','" . $lang . "','" . $source . "')";
         $delvalues .= "(original ='$original' AND lang='$lang')";
-       // Setting the transaction log records
-        $logvalues .= "('" . $original . "','" . $translation . "','" . $lang . "','" . $by . "',FROM_UNIXTIME(" . $timestamp . "),'" . $source . "')" ;
+        // Setting the transaction log records
+        $logvalues .= "('" . $original . "','" . $translation . "','" . $lang . "','" . $by . "',FROM_UNIXTIME(" . $timestamp . "),'" . $source . "')";
 
         $update = "DELETE FROM " . $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE . " WHERE $delvalues";