X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..refs/tags/wordpress-4.4:/wp-includes/general-template.php diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index f4d6f37d..f554e1fd 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -17,8 +17,6 @@ * * @since 1.5.0 * - * @uses locate_template() - * * @param string $name The name of the specialised header. */ function get_header( $name = null ) { @@ -59,8 +57,6 @@ function get_header( $name = null ) { * * @since 1.5.0 * - * @uses locate_template() - * * @param string $name The name of the specialised footer. */ function get_footer( $name = null ) { @@ -101,8 +97,6 @@ function get_footer( $name = null ) { * * @since 1.5.0 * - * @uses locate_template() - * * @param string $name The name of the specialised sidebar. */ function get_sidebar( $name = null ) { @@ -150,8 +144,6 @@ function get_sidebar( $name = null ) { * * @since 3.0.0 * - * @uses locate_template() - * * @param string $slug The slug name for the generic template. * @param string $name The name of the specialised template. */ @@ -159,7 +151,7 @@ function get_template_part( $slug, $name = null ) { /** * Fires before the specified template part file is loaded. * - * The dynamic portion of the hook name, $slug, refers to the slug name + * The dynamic portion of the hook name, `$slug`, refers to the slug name * for the generic template part. * * @since 3.0.0 @@ -198,8 +190,8 @@ function get_template_part( $slug, $name = null ) { * * @since 2.7.0 * - * @param boolean $echo Default to echo and not return the form. - * @return string|null String when retrieving, null when displaying or if searchform.php exists. + * @param bool $echo Default to echo and not return the form. + * @return string|void String when $echo is false. */ function get_search_form( $echo = true ) { /** @@ -276,8 +268,8 @@ function get_search_form( $echo = true ) { * @since 1.5.0 * * @param string $redirect Optional path to redirect to on login/logout. - * @param boolean $echo Default to echo and not return the link. - * @return string|null String when retrieving, null when displaying. + * @param bool $echo Default to echo and not return the link. + * @return string|void String when retrieving. */ function wp_loginout($redirect = '', $echo = true) { if ( ! is_user_logged_in() ) @@ -307,9 +299,6 @@ function wp_loginout($redirect = '', $echo = true) { * * @since 2.7.0 * - * @uses wp_nonce_url() To protect against CSRF. - * @uses site_url() To generate the log out URL. - * * @param string $redirect Path to redirect to on logout. * @return string A log out URL. */ @@ -334,16 +323,12 @@ function wp_logout_url($redirect = '') { } /** - * Returns the Log In URL. - * * Returns the URL that allows the user to log in to the site. * * @since 2.7.0 * - * @uses site_url() To generate the log in URL. - * - * @param string $redirect Path to redirect to on login. - * @param bool $force_reauth Whether to force reauthorization, even if a cookie is present. Default is false. + * @param string $redirect Path to redirect to on login. + * @param bool $force_reauth Whether to force reauthorization, even if a cookie is present. Default is false. * @return string A log in URL. */ function wp_login_url($redirect = '', $force_reauth = false) { @@ -359,22 +344,20 @@ function wp_login_url($redirect = '', $force_reauth = false) { * Filter the login URL. * * @since 2.8.0 + * @since 4.2.0 The `$force_reauth` parameter was added. * - * @param string $login_url The login URL. - * @param string $redirect The path to redirect to on login, if supplied. + * @param string $login_url The login URL. + * @param string $redirect The path to redirect to on login, if supplied. + * @param bool $force_reauth Whether to force reauthorization, even if a cookie is present. */ - return apply_filters( 'login_url', $login_url, $redirect ); + return apply_filters( 'login_url', $login_url, $redirect, $force_reauth ); } /** - * Returns the user registration URL. - * * Returns the URL that allows the user to register on the site. * * @since 3.6.0 * - * @uses site_url() To generate the registration URL. - * * @return string User registration URL. */ function wp_registration_url() { @@ -389,18 +372,41 @@ function wp_registration_url() { } /** - * Provides a simple login form for use anywhere within WordPress. By default, it echoes - * the HTML immediately. Pass array('echo'=>false) to return the string instead. + * Provides a simple login form for use anywhere within WordPress. + * + * The login format HTML is echoed by default. Pass a false value for `$echo` to return it instead. * * @since 3.0.0 * - * @param array $args Configuration options to modify the form output. - * @return string|null String when retrieving, null when displaying. + * @param array $args { + * Optional. Array of options to control the form output. Default empty array. + * + * @type bool $echo Whether to display the login form or return the form HTML code. + * Default true (echo). + * @type string $redirect URL to redirect to. Must be absolute, as in "https://example.com/mypage/". + * Default is to redirect back to the request URI. + * @type string $form_id ID attribute value for the form. Default 'loginform'. + * @type string $label_username Label for the username field. Default 'Username'. + * @type string $label_password Label for the password field. Default 'Password'. + * @type string $label_remember Label for the remember field. Default 'Remember Me'. + * @type string $label_log_in Label for the submit button. Default 'Log In'. + * @type string $id_username ID attribute value for the username field. Default 'user_login'. + * @type string $id_password ID attribute value for the password field. Default 'user_pass'. + * @type string $id_remember ID attribute value for the remember field. Default 'rememberme'. + * @type string $id_submit ID attribute value for the submit button. Default 'wp-submit'. + * @type bool $remember Whether to display the "rememberme" checkbox in the form. + * @type string $value_username Default value for the username field. Default empty. + * @type bool $value_remember Whether the "Remember Me" checkbox should be checked by default. + * Default false (unchecked). + * + * } + * @return string|void String when retrieving. */ function wp_login_form( $args = array() ) { $defaults = array( 'echo' => true, - 'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], // Default redirect is back to the current page + // Default 'redirect' value takes the user back to the request URI. + 'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'form_id' => 'loginform', 'label_username' => __( 'Username' ), 'label_password' => __( 'Password' ), @@ -412,7 +418,8 @@ function wp_login_form( $args = array() ) { 'id_submit' => 'wp-submit', 'remember' => true, 'value_username' => '', - 'value_remember' => false, // Set this to true to default the "Remember me" checkbox to checked + // Set 'value_remember' to true to default the "Remember me" checkbox to checked. + 'value_remember' => false, ); /** @@ -464,7 +471,7 @@ function wp_login_form( $args = array() ) { $login_form_bottom = apply_filters( 'login_form_bottom', '', $args ); $form = ' -