Changeset 6139

Timestamp:

11/17/2017 10:08:15 AM (7 years ago)

Author:

ocean90

Message:

Plugin Directory: Use new table for locales.

Location:

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

Files:

• api/routes/class-locale-banner.php (modified) (1 diff)
• class-template.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php

@@ -36 +36 @@
         // Get the locale subdomain associations used to link languages to their local site.
         $locale_subdomain_assoc = $wpdb->get_results(
-            "SELECT locale, subdomain FROM locales WHERE locale NOT LIKE '%\_%\_%'", OBJECT_K // Don't grab variants, for now.
+            "SELECT locale, subdomain FROM locales WHERE wporg_locale NOT LIKE '%\_%\_%'", OBJECT_K // Don't grab variants, for now.
         );
 

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

@@ -677 +677 @@
         wp_cache_add_global_groups( array( 'locale-associations' ) );
 
-        if ( false === ( $sites = wp_cache_get( 'local-sites-'.get_post()->post_name, 'locale-associations' ) ) ) {
+        if ( false === ( $sites = wp_cache_get( 'local-sites-' . get_post()->post_name, 'locale-associations' ) ) ) {
 
             // get subdomain/locale associations
-            $subdomains = $wpdb->get_results( 'SELECT locale, subdomain FROM locales', OBJECT_K );
+            $subdomains = $wpdb->get_results( 'SELECT locale, subdomain FROM wporg_locales', OBJECT_K );
 
             $sites = Plugin_I18n::instance()->get_locales();