Changeset 34348

Timestamp:

09/20/2015 03:51:55 AM (10 years ago)

Author:

wonderboymusic

Message:

Pass false as the 2nd argument to class_exists() to disable autoloading and to not cause problems for those who define __autoload().

Fixes #20523.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/deprecated.php (modified) (2 diffs)
• wp-admin/includes/file.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/misc.php (modified) (3 diffs)
• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-admin/includes/template-functions.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/class-feed.php (modified) (1 diff)
• wp-includes/class-oembed.php (modified) (1 diff)
• wp-includes/class-simplepie.php (modified) (1 diff)
• wp-includes/class-snoopy.php (modified) (1 diff)
• wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/pluggable-deprecated.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/pomo/entry.php (modified) (1 diff)
• wp-includes/pomo/mo.php (modified) (1 diff)
• wp-includes/pomo/po.php (modified) (2 diffs)
• wp-includes/pomo/streams.php (modified) (5 diffs)
• wp-includes/pomo/translations.php (modified) (2 diffs)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-includes/wp-diff.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1166 +1166 @@
     $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] );
 
-    if ( ! class_exists( $walker_class_name ) )
+    if ( ! class_exists( $walker_class_name, false ) )
         wp_die( 0 );
 

trunk/src/wp-admin/includes/deprecated.php

@@ -317 +317 @@
 }
 
-if ( !class_exists('WP_User_Search') ) :
+if ( ! class_exists( 'WP_User_Search', false ) ) :
 /**
  * WordPress User Search class.
@@ -758 +758 @@
     static $num = 1;
 
-    if ( ! class_exists('_WP_Editors' ) )
+    if ( ! class_exists( '_WP_Editors', false ) )
         require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
 

trunk/src/wp-admin/includes/file.php

@@ -560 +560 @@
      * @param bool $ziparchive Whether to use ZipArchive. Default true.
      */
-    if ( class_exists( 'ZipArchive' ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+    if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
         $result = _unzip_file_ziparchive($file, $to, $needed_dirs);
         if ( true === $result ) {
@@ -849 +849 @@
         return false;
 
-    if ( ! class_exists("WP_Filesystem_$method") ) {
+    if ( ! class_exists( "WP_Filesystem_$method", false  ) ) {
 
         /**

trunk/src/wp-admin/includes/media.php

@@ -2975 +2975 @@
     $metadata = array();
 
-    if ( ! class_exists( 'getID3' ) )
+    if ( ! class_exists( 'getID3', false ) )
         require( ABSPATH . WPINC . '/ID3/getid3.php' );
     $id3 = new getID3();
@@ -3030 +3030 @@
     $metadata = array();
 
-    if ( ! class_exists( 'getID3' ) )
+    if ( ! class_exists( 'getID3', false ) )
         require( ABSPATH . WPINC . '/ID3/getid3.php' );
     $id3 = new getID3();

trunk/src/wp-admin/includes/misc.php

@@ -455 +455 @@
     if ( ! file_exists($filename) )
         return false;
-    if ( ! class_exists('DOMDocument') )
+    if ( ! class_exists( 'DOMDocument', false ) ) {
         return false;
+    }
 
     $doc = new DOMDocument();
@@ -482 +483 @@
         return true;
 
-    if ( ! class_exists('DOMDocument') )
+    if ( ! class_exists( 'DOMDocument', false ) ) {
         return false;
+    }
 
     $doc = new DOMDocument();
@@ -512 +514 @@
  */
 function iis7_add_rewrite_rule($filename, $rewrite_rule) {
-    if ( ! class_exists('DOMDocument') )
+    if ( ! class_exists( 'DOMDocument', false ) ) {
         return false;
+    }
 
     // If configuration file does not exist then we create one.

trunk/src/wp-admin/includes/nav-menu.php

@@ -876 +876 @@
         $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
 
-        if ( class_exists( $walker_class_name ) )
+        if ( class_exists( $walker_class_name, false ) )
             $walker = new $walker_class_name;
         else

trunk/src/wp-admin/includes/template-functions.php

@@ -1911 +1911 @@
  */
 function convert_to_screen( $hook_name ) {
-    if ( ! class_exists( 'WP_Screen' ) ) {
+    if ( ! class_exists( 'WP_Screen', false ) ) {
         _doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3' );
         return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );

trunk/src/wp-includes/admin-bar.php

@@ -38 +38 @@
      */
     $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-    if ( class_exists( $admin_bar_class ) )
+    if ( class_exists( $admin_bar_class, false ) )
         $wp_admin_bar = new $admin_bar_class;
     else

trunk/src/wp-includes/class-feed.php

@@ -1 +1 @@
 <?php
 
-if ( !class_exists('SimplePie') )
+if ( ! class_exists( 'SimplePie', false ) )
     require_once( ABSPATH . WPINC . '/class-simplepie.php' );
 

trunk/src/wp-includes/class-oembed.php

@@ -490 +490 @@
      */
     private function _parse_xml_body( $response_body ) {
-        if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) )
+        if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
             return false;
 

trunk/src/wp-includes/class-simplepie.php

@@ -1 +1 @@
 <?php
-if ( ! class_exists( 'SimplePie' ) ) :
+if ( ! class_exists( 'SimplePie', false ) ) :
 
 // Load classes we will need.

trunk/src/wp-includes/class-snoopy.php

@@ -6 +6 @@
 _deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/http.php' );
 
-if ( !class_exists( 'Snoopy' ) ) :
+if ( ! class_exists( 'Snoopy', false ) ) :
 /*************************************************
 

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -49 +49 @@
 
         // First, test Imagick's extension and classes.
-        if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
+        if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
             return false;
 

trunk/src/wp-includes/functions.php

@@ -3691 +3691 @@
          * via ISAPI then pretty permalinks will not work.
          */
-        $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
+        $supports_permalinks = class_exists( 'DOMDocument', false ) && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
     }
 

trunk/src/wp-includes/general-template.php

@@ -2581 +2581 @@
  */
 function wp_editor( $content, $editor_id, $settings = array() ) {
-    if ( ! class_exists( '_WP_Editors' ) )
+    if ( ! class_exists( '_WP_Editors', false ) )
         require( ABSPATH . WPINC . '/class-wp-editor.php' );
 

trunk/src/wp-includes/pluggable-deprecated.php

@@ -179 +179 @@
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server' ) ) {
+if ( ! class_exists( 'wp_atom_server', false ) ) {
     class wp_atom_server {
         public function __call( $name, $arguments ) {

trunk/src/wp-includes/pluggable.php

@@ -2388 +2388 @@
     $args = wp_parse_args( $args, $defaults );
 
-    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
+    if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
         require( ABSPATH . WPINC . '/wp-diff.php' );
 

trunk/src/wp-includes/pomo/entry.php

@@ -8 +8 @@
  */
 
-if ( !class_exists( 'Translation_Entry' ) ):
+if ( ! class_exists( 'Translation_Entry', false ) ):
 /**
  * Translation_Entry class encapsulates a translatable string

trunk/src/wp-includes/pomo/mo.php

@@ -11 +11 @@
 require_once dirname(__FILE__) . '/streams.php';
 
-if ( !class_exists( 'MO' ) ):
+if ( ! class_exists( 'MO', false ) ):
 class MO extends Gettext_Translations {
 

trunk/src/wp-includes/pomo/po.php

@@ -17 +17 @@
  * Routines for working with PO files
  */
-if ( !class_exists( 'PO' ) ):
+if ( ! class_exists( 'PO', false ) ):
 class PO extends Gettext_Translations {
 
@@ -356 +356 @@
      * @staticvar string   $last_line
      * @staticvar boolean  $use_last_line
-     * 
+     *
      * @param     resource $f
      * @param     string   $action

trunk/src/wp-includes/pomo/streams.php

@@ -9 +9 @@
  */
 
-if ( !class_exists( 'POMO_Reader' ) ):
+if ( ! class_exists( 'POMO_Reader', false ) ):
 class POMO_Reader {
 
@@ -135 +135 @@
 endif;
 
-if ( !class_exists( 'POMO_FileReader' ) ):
+if ( ! class_exists( 'POMO_FileReader', false ) ):
 class POMO_FileReader extends POMO_Reader {
 
@@ -205 +205 @@
 endif;
 
-if ( !class_exists( 'POMO_StringReader' ) ):
+if ( ! class_exists( 'POMO_StringReader', false ) ):
 /**
  * Provides file-like methods for manipulating a string instead
@@ -268 +268 @@
 endif;
 
-if ( !class_exists( 'POMO_CachedFileReader' ) ):
+if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
 /**
  * Reads the contents of the file in the beginning.
@@ -293 +293 @@
 endif;
 
-if ( !class_exists( 'POMO_CachedIntFileReader' ) ):
+if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
 /**
  * Reads the contents of the file in the beginning.

trunk/src/wp-includes/pomo/translations.php

@@ -10 +10 @@
 require_once dirname(__FILE__) . '/entry.php';
 
-if ( !class_exists( 'Translations' ) ):
+if ( ! class_exists( 'Translations', false ) ):
 class Translations {
     var $entries = array();
@@ -273 +273 @@
 endif;
 
-if ( !class_exists( 'NOOP_Translations' ) ):
+if ( ! class_exists( 'NOOP_Translations', false ) ):
 /**
  * Provides the same interface as Translations, but doesn't do anything

trunk/src/wp-includes/wp-db.php

@@ -2994 +2994 @@
     public function bail( $message, $error_code = '500' ) {
         if ( !$this->show_errors ) {
-            if ( class_exists( 'WP_Error' ) )
+            if ( class_exists( 'WP_Error', false ) ) {
                 $this->error = new WP_Error($error_code, $message);
-            else
+            } else {
                 $this->error = $message;
+            }
             return false;
         }

trunk/src/wp-includes/wp-diff.php

@@ -9 +9 @@
  */
 
-if ( !class_exists( 'Text_Diff' ) ) {
+if ( ! class_exists( 'Text_Diff', false ) ) {
     /** Text_Diff class */
     require( dirname(__FILE__).'/Text/Diff.php' );