Ticket #23794: 23794.diff

src/wp-includes/deprecated.php

@@ -3754 +3754 @@
         $upload_dir = wp_get_upload_dir();
         return $upload_dir['baseurl'];
 }
+
+/**
+ * Load the translated strings for a plugin residing in the mu-plugins directory.
+ *
+ * @since 3.0.0
+ * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
+ * @deprecated 4.6.0 Use load_plugin_textdomain()
+ * @see load_plugin_textdomain()
+ *
+ * @param string $domain             Text domain. Unique identifier for retrieving translated strings.
+ * @param string $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which the .mo file resides.
+ *                                   Default empty string.
+ * @return bool True when textdomain is successfully loaded, false otherwise.
+ */
+function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
+        _deprecated_function( __FUNCTION__, '4.5', 'load_plugin_textdomain()' );
+
+        /** This filter is documented in wp-includes/l10n.php */
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+
+        $mofile = $domain . '-' . $locale . '.mo';
+
+        // Try to load from the languages directory first.
+        if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+                return true;
+        }
+
+        $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) );
+
+        return load_textdomain( $domain, $path . '/' . $mofile );
+}

src/wp-includes/l10n.php

@@ -656 +656 @@
  *
  * @since 1.5.0
  * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
+ * @since 4.6.0 If there is no .mo file in the plugin directory, it falls back to the mu-plugins directory.
  *
  * @param string $domain          Unique identifier for retrieving translated strings
  * @param string $deprecated      Use the $plugin_rel_path parameter instead.
@@ -690 +691 @@
                 $path = WP_PLUGIN_DIR;
         }
 
-        return load_textdomain( $domain, $path . '/' . $mofile );
-}
-
-/**
- * Load the translated strings for a plugin residing in the mu-plugins directory.
- *
- * @since 3.0.0
- * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
- *
- * @param string $domain             Text domain. Unique identifier for retrieving translated strings.
- * @param string $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which the .mo file resides.
- *                                   Default empty string.
- * @return bool True when textdomain is successfully loaded, false otherwise.
- */
-function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
-        /** This filter is documented in wp-includes/l10n.php */
-        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
-
-        $mofile = $domain . '-' . $locale . '.mo';
-
-        // Try to load from the languages directory first.
-        if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+        if ( load_textdomain( $domain, $path . '/' . $mofile ) ) {
                 return true;
         }
 
-        $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) );
+        $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $plugin_rel_path, '/' ) );
 
         return load_textdomain( $domain, $path . '/' . $mofile );
 }