Changeset 3391

Timestamp:

06/16/2016 04:40:43 PM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Use the correct table prefix for the GlotPress tables.

See #1691.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php (modified) (8 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -34 +34 @@
     }
 
-    function __construct( $db, $tracker = null ) {
-        if ( !empty( $db ) && is_object( $db ) ) {
-            $this->db = $db;
-        }
-
-        wp_cache_add_global_groups( $this->i18n_cache_group );
+    function __construct( $db, $tracker = null ) {
+        if ( !empty( $db ) && is_object( $db ) ) {
+            $this->db = $db;
+        }
+
+        wp_cache_add_global_groups( $this->i18n_cache_group );
     }
 
@@ -116 +116 @@
 
         $branch_id = $this->db->get_var( $this->db->prepare(
-            'SELECT id FROM '.GLOTPRESS_TABLE_PREFIX.'_projects WHERE path = %s',
+            'SELECT id FROM ' . GLOTPRESS_TABLE_PREFIX . 'projects WHERE path = %s',
             "wp-plugins/{$slug}/{$branch}"
         ) );
@@ -162 +162 @@
 
         $originals = $this->db->get_results( $this->db->prepare(
-            'SELECT id, singular, comment FROM '.GLOTPRESS_TABLE_PREFIX.'_originals WHERE project_id = %d AND status = %s ORDER BY CHAR_LENGTH(singular) DESC',
+            'SELECT id, singular, comment FROM ' . GLOTPRESS_TABLE_PREFIX . 'originals WHERE project_id = %d AND status = %s ORDER BY CHAR_LENGTH(singular) DESC',
             $branch_id, '+active'
         ) );
@@ -198 +198 @@
 
         $translation_set_id = $this->db->get_var( $this->db->prepare(
-            'SELECT id FROM '.GLOTPRESS_TABLE_PREFIX.'_translation_sets WHERE project_id = %d AND locale = %s',
+            'SELECT id FROM ' . GLOTPRESS_TABLE_PREFIX . 'translation_sets WHERE project_id = %d AND locale = %s',
             $branch_id, $locale ) );
 
@@ -204 +204 @@
             // Don't give up yet. Might be given fr_FR, which actually exists as locale=fr in GP.
             $translation_set_id = $this->db->get_var( $this->db->prepare(
-                'SELECT id FROM '.GLOTPRESS_TABLE_PREFIX.'_translation_sets WHERE project_id = %d AND locale = %s',
+                'SELECT id FROM ' . GLOTPRESS_TABLE_PREFIX . 'translation_sets WHERE project_id = %d AND locale = %s',
                 $branch_id, preg_replace( '/^([^-]+)(-.+)?$/', '\1', $locale ) ) );
         }
@@ -241 +241 @@
 
         $original = $this->db->get_row( $this->db->prepare(
-            'SELECT id, singular, comment FROM '.GLOTPRESS_TABLE_PREFIX.'_originals WHERE project_id = %d AND status = %s AND singular = %s',
+            'SELECT id, singular, comment FROM ' . GLOTPRESS_TABLE_PREFIX . 'originals WHERE project_id = %d AND status = %s AND singular = %s',
             $branch_id, '+active', $str
         ) );
@@ -350 +350 @@
 
             $translation = $this->db->get_var( $this->db->prepare(
-                'SELECT translation_0 FROM '.GLOTPRESS_TABLE_PREFIX.'_translations WHERE original_id = %d AND translation_set_id = %d AND status = %s',
+                'SELECT translation_0 FROM ' . GLOTPRESS_TABLE_PREFIX . 'translations WHERE original_id = %d AND translation_set_id = %d AND status = %s',
                 $original->id, $translation_set_id, 'current'
             ) );
@@ -385 +385 @@
         return $content;
     }
-
 }
-