Changeset 926

Timestamp:

10/21/2014 11:25:21 PM (12 years ago)

Author:

nacin

Message:

Credits: Proper fix for #664. The tables are in separate databases, can't join them. The path restriction is because team P2s do/will exist. see #664.

File:

• sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php

@@ -96 +96 @@
                 $cache_key = array(
                         'translators' => 'translators-' . $gp_locale->slug . '-' . $this->version . '-' . $path,
-                        'validators'  => 'validators-' . $gp_locale->slug . '-' . $this->version . '-changed-1',
+                        'validators'  => 'validators-' . $gp_locale->slug . '-' . $this->version . '-changed-2',
                 );
 
@@ -191 +191 @@
         protected function grab_validators( $gp_locale ) {
                 global $wpdb;
-                $blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM wporg_blogs INNER JOIN locales ON wporg_blogs.domain = CONCAT(locales.subdomain, '.wordpress.org') WHERE locales.locale = %s", $gp_locale->wp_locale ) );
+                $subdomain = $wpdb->get_var( $wpdb->prepare( "SELECT subdomain FROM locales WHERE locale = %s", $gp_locale->wp_locale ) );
+                $blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM wporg_blogs WHERE domain = %s AND path = '/'", "$subdomain.wordpress.org" ) );
                 if ( $blog_id ) {
                         $meta_key = 'wporg_' . intval( $blog_id ) . '_capabilities';