Ticket #23040: 23040.r1.patch

wp-includes/class-wp-theme.php

@@ -310 +310 @@
 
         /**
          * __isset() magic method for properties formerly returned by current_theme_info()
+         * Use appropriate method to obtain WP_Theme properties.
          */
         public function __isset( $offset ) {
                 static $properties = array(
@@ -317 +318 @@
                         'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
                 );
 
+                _doing_it_wrong( __METHOD__, sprintf( __( 'Please use the appropriate, public WP_Theme method: %s.' ), $this->_deprecated( $offset ) ), '4.1' );
+
                 return in_array( $offset, $properties );
         }
 
+        /** 
+        * Generate appropriate WP_Theme method for _doing_it_wrong notice. 
+        */ 
+        private function _deprecated( $offset ) { 
+                $properties = array( 
+                        'name'           => "wp_get_theme()->get('Name')", 
+                        'title'          => "wp_get_theme()->get('Name')", 
+                        'version'        => "wp_get_theme()->get('Version')", 
+                        'parent_theme'   => "wp_get_theme()->parent() ? wp_get_theme()->->parent() : wp_get_theme()->get('Name')", 
+                        'template_dir'   => "wp_get_theme()->get_template_directory()", 
+                        'stylesheet_dir' => "wp_get_theme()->get_stylesheet_directory()", 
+                        'template'       => "wp_get_theme()->get_template()", 
+                        'stylesheet'     => "wp_get_theme()->get_stylesheet()", 
+                        'screenshot'     => "wp_get_theme()->get_screenshot()", 
+                        'description'    => "wp_get_theme()->display('description')", 
+                        'author'         => "wp_get_theme()->display('author')", 
+                        'tags'           => "wp_get_theme()->get('Tags')", 
+                        'theme_root'     => "wp_get_theme()->get_theme_root()", 
+                        'theme_root_uri' => "wp_get_theme()->get_theme_root_uri()", 
+                        'default'        => "wp_get_theme()->offsetGet( $offset )", 
+                        ); 
+                return isset( $properties[ $offset ] ) ? $properties[ $offset ] : $properties['default']; 
+        }
+
         /**
          * __get() magic method for properties formerly returned by current_theme_info()
+         * Use appropriate method to obtain WP_Theme properties.
          */
         public function __get( $offset ) {
+                _doing_it_wrong( __METHOD__, sprintf( __( 'Please use the appropriate, public WP_Theme method: %s.' ), $this->_deprecated( $offset ) ), '4.2' );
+
                 switch ( $offset ) {
                         case 'name' :
                         case 'title' :
@@ -373 +403 @@
          * Method to implement ArrayAccess for keys formerly returned by get_themes()
          */
         public function offsetExists( $offset ) {
+                _deprecated_function( __METHOD__, sprintf( __( 'Please use the appropriate, public WP_Theme method: %s.' ), $this->_deprecated( $offset ) ), '4.2' );
+
                 static $keys = array(
                         'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
                         'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',