Changeset 18879 for trunk/wp-admin/includes/screen.php

Timestamp:

10/04/2011 05:21:59 PM (15 years ago)

Author:

azaozz

Message:

Make $current_screen->add_option() easier to use, see #18690

File:

• trunk/wp-admin/includes/screen.php (modified) (3 diffs)

trunk/wp-admin/includes/screen.php

@@ -367 +367 @@
          * @param mixed $args Associative array of arguments particular to the default $option or the HTML string to be printed in the Screen Options tab.
          */
-        public function add_option( $option = false, $args ) {
+        public function add_option( $option, $args = null ) {
                 if ( is_array($args) && !empty($option) )
                         $this->_options[ $option ] = $args;
-                elseif ( is_string($args) )
-                        $this->_options['_screen_settings'] .= $args;
+                elseif ( is_string($option) )
+                        $this->_options['_screen_settings'] .= $option;
+                else
+                        return false;
 
                 $this->_show_options = true;
+                return true;
         }
         
@@ -414 +417 @@
                 // Ensure we have title and ID.
                 if ( ! $args['title'] || ! $args['id'] )
-                        return;
+                        return false;
 
                 $this->_help_tabs[] = $args;
+                return true;
         }
 
@@ -443 +447 @@
 
                 // Intended for adding Help and Screen Options.
-                do_action('add_screen_help_and_options');
+                do_action('add_screen_help_and_options', $this);
 
                 // Call old contextual_help_list filter.