Changeset 24126

Timestamp:

04/29/2013 01:26:31 PM (11 years ago)

Author:

nacin

Message:

Required arguments can't follow optional arguments.

Make required arguments optional in confirm_blog_signup().

Mark arguments as required in _future_post_hook(), the walker method display_element(), get_author_link() (deprecated), and the WP_Widget constructor.

props rlerdorf.
see #24210.

Location:

trunk

Files:

• wp-includes/class-wp-walker.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (2 diffs)
• wp-signup.php (modified) (1 diff)

trunk/wp-includes/class-wp-walker.php

@@ -116 +116 @@
      * @return null Null on failure with no changes to parameters.
      */
-    function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) {
+    function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
 
         if ( !$element )

trunk/wp-includes/comment-template.php

@@ -1296 +1296 @@
      *
      */
-    function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) {
+    function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
 
         if ( !$element )

trunk/wp-includes/deprecated.php

@@ -795 +795 @@
  * @see get_author_posts_url()
  *
- * @param bool $echo Optional.
- * @param int $author_id Required.
+ * @param bool $echo
+ * @param int $author_id
  * @param string $author_nicename Optional.
  * @return string|null
  */
-function get_author_link($echo = false, $author_id, $author_nicename = '') {
+function get_author_link($echo, $author_id, $author_nicename = '') {
     _deprecated_function( __FUNCTION__, '2.1', 'get_author_posts_url()' );
 

trunk/wp-includes/post.php

@@ -4787 +4787 @@
  * @param object $post Object type containing the post information
  */
-function _future_post_hook( $deprecated = '', $post ) {
+function _future_post_hook( $deprecated, $post ) {
     wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
     wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) );

trunk/wp-includes/widgets.php

@@ -74 +74 @@
      * PHP4 constructor
      */
-    function WP_Widget( $id_base = false, $name, $widget_options = array(), $control_options = array() ) {
+    function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
         WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
     }
@@ -91 +91 @@
      *   - height: currently not used but may be needed in the future
      */
-    function __construct( $id_base = false, $name, $widget_options = array(), $control_options = array() ) {
+    function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
         $this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
         $this->name = $name;

trunk/wp-signup.php

@@ -491 +491 @@
  * @param string $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
  */
-function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
+function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
     ?>
     <h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>