Changeset 28481 for trunk/src/wp-admin/custom-header.php

Timestamp:

05/18/2014 09:30:43 PM (12 years ago)

Author:

wonderboymusic

Message:

Use proper access modifiers and add a magic __get() method to Custom_Background and Custom_Image_Header.

See #27881, #22234.

File:

• trunk/src/wp-admin/custom-header.php (modified) (32 diffs)

trunk/src/wp-admin/custom-header.php

@@ -23 +23 @@
          * @access private
          */
-        var $admin_header_callback;
+        private $admin_header_callback;
 
         /**
@@ -32 +32 @@
          * @access private
          */
-        var $admin_image_div_callback;
+        private $admin_image_div_callback;
 
         /**
@@ -41 +41 @@
          * @access private
          */
-        var $default_headers = array();
+        private $default_headers = array();
 
         /**
@@ -50 +50 @@
          * @access private
          */
-        var $uploaded_headers = array();
+        private $uploaded_headers = array();
 
         /**
@@ -59 +59 @@
          * @access private
          */
-        var $page = '';
+        private $page = '';
 
         /**
@@ -69 +69 @@
          * @return Custom_Image_Header
          */
-        function __construct($admin_header_callback, $admin_image_div_callback = '') {
+        public function __construct($admin_header_callback, $admin_image_div_callback = '') {
                 $this->admin_header_callback = $admin_header_callback;
                 $this->admin_image_div_callback = $admin_image_div_callback;
@@ -82 +82 @@
 
         /**
+         * Make private properties readable for backwards compatibility
+         *
+         * @since 4.0.0
+         * @param string $name
+         * @return mixed
+         */
+        public function __get( $name ) {
+                return $this->$name;
+        }
+
+        /**
          * Set up the hooks for the Custom Header admin page.
          *
          * @since 2.1.0
          */
-        function init() {
+        public function init() {
                 if ( ! current_user_can('edit_theme_options') )
                         return;
@@ -107 +118 @@
          * @since 3.0.0
          */
-        function help() {
+        public function help() {
                 get_current_screen()->add_help_tab( array(
                         'id'      => 'overview',
@@ -149 +160 @@
          * @return int Current step
          */
-        function step() {
+        public function step() {
                 if ( ! isset( $_GET['step'] ) )
                         return 1;
@@ -168 +179 @@
          * @since 2.1.0
          */
-        function js_includes() {
+        public function js_includes() {
                 $step = $this->step();
 
@@ -186 +197 @@
          * @since 2.7.0
          */
-        function css_includes() {
+        public function css_includes() {
                 $step = $this->step();
 
@@ -200 +211 @@
          * @since 2.6.0
          */
-        function take_action() {
+        public function take_action() {
                 if ( ! current_user_can('edit_theme_options') )
                         return;
@@ -246 +257 @@
          * @since 3.0.0
          */
-        function process_default_headers() {
+        public function process_default_headers() {
                 global $_wp_default_headers;
 
@@ -276 +287 @@
          * @since 3.0.0
          */
-        function show_header_selector( $type = 'default' ) {
+        public function show_header_selector( $type = 'default' ) {
                 if ( 'default' == $type ) {
                         $headers = $this->default_headers;
@@ -313 +324 @@
          * @since 2.1.0
          */
-        function js() {
+        public function js() {
                 $step = $this->step();
                 if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
@@ -326 +337 @@
          * @since 2.6.0
          */
-        function js_1() {
+        public function js_1() {
                 $default_color = '';
                 if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
@@ -342 +353 @@
                 header_text_fields;
 
-        function pickColor(color) {
+        public function pickColor(color) {
                 $('#name').css('color', color);
                 $('#desc').css('color', color);
@@ -348 +359 @@
         }
 
-        function toggle_text() {
+        public function toggle_text() {
                 var checked = $('#display-header-text').prop('checked'),
                         text_color;
@@ -390 +401 @@
          * @since 2.6.0
          */
-        function js_2() { ?>
+        public function js_2() { ?>
 <script type="text/javascript">
 /* <![CDATA[ */
-        function onEndCrop( coords ) {
+        public function onEndCrop( coords ) {
                 jQuery( '#x1' ).val(coords.x);
                 jQuery( '#y1' ).val(coords.y);
@@ -442 +453 @@
                         }
                         ?>
-                        onInit: function () {
+                        onInit: public function () {
                                 jQuery('#width').val(xinit);
                                 jQuery('#height').val(yinit);
@@ -464 +475 @@
          * @since 2.1.0
          */
-        function step_1() {
+        public function step_1() {
                 $this->process_default_headers();
 ?>
@@ -682 +693 @@
          * @since 2.1.0
          */
-        function step_2() {
+        public function step_2() {
                 check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
                 if ( ! current_theme_supports( 'custom-header', 'uploads' ) )
@@ -796 +807 @@
          * @since 3.4.0
          */
-        function step_2_manage_upload() {
+        public function step_2_manage_upload() {
                 $overrides = array('test_form' => false);
 
@@ -833 +844 @@
          * @since 2.1.0
          */
-        function step_3() {
+        public function step_3() {
                 check_admin_referer( 'custom-header-crop-image' );
 
@@ -909 +920 @@
          * @since 2.1.0
          */
-        function finished() {
+        public function finished() {
                 $this->updated = true;
                 $this->step_1();
@@ -919 +930 @@
          * @since 2.1.0
          */
-        function admin_page() {
+        public function admin_page() {
                 if ( ! current_user_can('edit_theme_options') )
                         wp_die(__('You do not have permission to customize headers.'));
@@ -936 +947 @@
          * @since 3.4.0
          */
-        function attachment_fields_to_edit( $form_fields ) {
+        public function attachment_fields_to_edit( $form_fields ) {
                 return $form_fields;
         }
@@ -945 +956 @@
          * @since 3.4.0
          */
-        function filter_upload_tabs( $tabs ) {
+        public function filter_upload_tabs( $tabs ) {
                 return $tabs;
         }
@@ -1148 +1159 @@
          * new object. Returns JSON-encoded object details.
          */
-        function ajax_header_crop() {
+        public function ajax_header_crop() {
                 check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
 
@@ -1205 +1216 @@
          * Media Manager, even if s/he doesn't save that change.
          */
-        function ajax_header_add() {
+        public function ajax_header_add() {
                 check_ajax_referer( 'header-add', 'nonce' );
 
@@ -1231 +1242 @@
          * choice in the Customizer's Header tool.
          */
-        function ajax_header_remove() {
+        public function ajax_header_remove() {
                 check_ajax_referer( 'header-remove', 'nonce' );
 
@@ -1250 +1261 @@
         }
 
-        function customize_set_last_used( $wp_customize ) {
+        public function customize_set_last_used( $wp_customize ) {
                 $data = $wp_customize->get_setting( 'header_image_data' )->post_value();