Changeset 1674

Timestamp:

06/18/2015 06:59:30 PM (10 years ago)

Author:

ocean90

Message:

Translate: Remove a database query for slugs of translation sets in the routes plugin.

See ​https://glotpress.trac.wordpress.org/changeset/1052/.

Location:

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes

Files:

• routes/locale.php (modified) (1 diff)
• wporg-routes.php (modified) (3 diffs)

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/routes/locale.php

@@ -123 +123 @@
         }
 
+        if ( 'default' !== $current_set_slug && ! isset( $set_slugs[ $current_set_slug ] ) ) {
+            return $this->die_with_404();
+        }
+
         if ( $set_slugs ) {
             // Make default the first item.

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-routes/wporg-routes.php

@@ -18 +18 @@
 
     public function init() {
+        $path = '(.+?)';
         $locale = '(' . implode( '|', array_map( function( $locale ) { return $locale->slug; }, GP_Locales::locales() ) ) . ')';
-        $set_slug = '(' . implode( '|', GP::$translation_set->existing_slugs() ) . ')';
 
         /*
@@ -26 +26 @@
          */
         unset( GP::$router->urls['/'] );
-        unset( GP::$router->urls["get:/languages/$locale/$set_slug"] );
+        unset( GP::$router->urls["get:/languages/$locale/$path"] );
         unset( GP::$router->urls["get:/languages/$locale"] );
         unset( GP::$router->urls['get:/languages'] );
@@ -32 +32 @@
         GP::$router->add( '/', array( 'GP_WPorg_Route_Index', 'get_index' ) );
         GP::$router->add( '/languages', array( 'GP_WPorg_Route_Locale', 'get_locales' ) );
-        GP::$router->add( "/languages/$locale/$set_slug/(.+?)", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
-        GP::$router->add( "/languages/$locale/$set_slug", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
+        GP::$router->add( "/languages/$locale/$path/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
+        GP::$router->add( "/languages/$locale/$path", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
         GP::$router->add( "/languages/$locale", array( 'GP_WPorg_Route_Locale', 'get_locale_projects' ) );
     }