' . __('Search for:') . '
@@ -253,7 +253,7 @@ function wp_login_url($redirect = '', $force_reauth = false) {
*/
function wp_login_form( $args = array() ) {
$defaults = array( 'echo' => true,
- 'redirect' => site_url( $_SERVER['REQUEST_URI'] ), // Default redirect is back to the current page
+ 'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], // Default redirect is back to the current page
'form_id' => 'loginform',
'label_username' => __( 'Username' ),
'label_password' => __( 'Password' ),
@@ -270,7 +270,7 @@ function wp_login_form( $args = array() ) {
$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
$form = '
-
';
@@ -306,14 +306,14 @@ function wp_login_form( $args = array() ) {
*
* @param string $redirect Path to redirect to on login.
*/
-function wp_lostpassword_url($redirect = '') {
+function wp_lostpassword_url( $redirect = '' ) {
$args = array( 'action' => 'lostpassword' );
if ( !empty($redirect) ) {
$args['redirect_to'] = $redirect;
}
- $lostpassword_url = add_query_arg($args, site_url('wp-login.php', 'login'));
- return apply_filters('lostpassword_url', $lostpassword_url, $redirect);
+ $lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+ return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
}
/**
@@ -1030,10 +1030,9 @@ function wp_get_archives($args = '') {
if ( $arcresults ) {
foreach ( (array) $arcresults as $arcresult ) {
if ( $arcresult->post_date != '0000-00-00 00:00:00' ) {
- $url = get_permalink($arcresult);
- $arc_title = $arcresult->post_title;
- if ( $arc_title )
- $text = strip_tags(apply_filters('the_title', $arc_title));
+ $url = get_permalink( $arcresult );
+ if ( $arcresult->post_title )
+ $text = strip_tags( apply_filters( 'the_title', $arcresult->post_title, $arcresult->ID ) );
else
$text = $arcresult->ID;
$output .= get_archives_link($url, $text, $format, $before, $after);
@@ -1640,34 +1639,35 @@ function feed_links_extra( $args = array() ) {
$args = wp_parse_args( $args, $defaults );
if ( is_single() || is_page() ) {
- $post = &get_post( $id = 0 );
+ $id = 0;
+ $post = &get_post( $id );
if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
- $title = esc_attr(sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) ));
+ $title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) );
$href = get_post_comments_feed_link( $post->ID );
}
} elseif ( is_category() ) {
$term = get_queried_object();
- $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name ));
+ $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
$href = get_category_feed_link( $term->term_id );
} elseif ( is_tag() ) {
$term = get_queried_object();
- $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name ));
+ $title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
$href = get_tag_feed_link( $term->term_id );
} elseif ( is_author() ) {
$author_id = intval( get_query_var('author') );
- $title = esc_attr(sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) ));
+ $title = sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
$href = get_author_feed_link( $author_id );
} elseif ( is_search() ) {
- $title = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) ));
+ $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
$href = get_search_feed_link();
}
if ( isset($title) && isset($href) )
- echo '
' . "\n";
+ echo '
' . "\n";
}
/**
@@ -1695,14 +1695,29 @@ function wlwmanifest_link() {
* Display a noindex meta tag if required by the blog configuration.
*
* If a blog is marked as not being public then the noindex meta tag will be
- * output to tell web robots not to index the page content.
+ * output to tell web robots not to index the page content. Add this to the wp_head action.
+ * Typical usage is as a wp_head callback. add_action( 'wp_head', 'noindex' );
+ *
+ * @see wp_no_robots
*
* @since 2.1.0
*/
function noindex() {
// If the blog is not public, tell robots to go away.
if ( '0' == get_option('blog_public') )
- echo "
\n";
+ wp_no_robots();
+}
+
+/**
+ * Display a noindex meta tag.
+ *
+ * Outputs a noindex meta tag that tells web robots not to index the page content.
+ * Typical usage is as a wp_head callback. add_action( 'wp_head', 'wp_no_robots' );
+ *
+ * @since 3.3.0
+ */
+function wp_no_robots() {
+ echo "
\n";
}
/**
@@ -1732,17 +1747,18 @@ function rich_edit_exists() {
* @return bool
*/
function user_can_richedit() {
- global $wp_rich_edit, $pagenow, $is_iphone;
-
- if ( !isset( $wp_rich_edit) ) {
- if ( get_user_option( 'rich_editing' ) == 'true' &&
- !$is_iphone && // this includes all Safari mobile browsers
- ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
- !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
- && 'comment.php' != $pagenow ) {
- $wp_rich_edit = true;
- } else {
- $wp_rich_edit = false;
+ global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_iphone, $is_IE;
+
+ if ( !isset($wp_rich_edit) ) {
+ $wp_rich_edit = false;
+
+ if ( get_user_option( 'rich_editing' ) == 'true' || !is_user_logged_in() ) { // default to 'true' for logged out users
+ if ( $is_safari ) {
+ if ( !$is_iphone || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 534 ) )
+ $wp_rich_edit = true;
+ } elseif ( $is_gecko || $is_opera || $is_chrome || $is_IE ) {
+ $wp_rich_edit = true;
+ }
}
}
@@ -1769,85 +1785,29 @@ function wp_default_editor() {
}
/**
- * Display visual editor forms: TinyMCE, or HTML, or both.
+ * Renders an editor.
*
- * The amount of rows the text area will have for the content has to be between
- * 3 and 100 or will default at 12. There is only one option used for all users,
- * named 'default_post_edit_rows'.
+ * Using this function is the proper way to output all needed components for both TinyMCE and Quicktags.
+ * _WP_Editors should not be used directly. See http://core.trac.wordpress.org/ticket/17144.
*
- * If the user can not use the rich editor (TinyMCE), then the switch button
- * will not be displayed.
+ * NOTE: Once initialized the TinyMCE editor cannot be safely moved in the DOM. For that reason
+ * running wp_editor() inside of a metabox is not a good idea unless only Quicktags is used.
+ * On the post edit screen several actions can be used to include additional editors
+ * containing TinyMCE: 'edit_page_form', 'edit_form_advanced' and 'dbx_post_sidebar'.
+ * See http://core.trac.wordpress.org/ticket/19173 for more information.
*
- * @since 2.1.0
+ * @see wp-includes/class-wp-editor.php
+ * @since 3.3
*
- * @param string $content Textarea content.
- * @param string $id Optional, default is 'content'. HTML ID attribute value.
- * @param string $prev_id Optional, default is 'title'. HTML ID name for switching back and forth between visual editors.
- * @param bool $media_buttons Optional, default is true. Whether to display media buttons.
- * @param int $tab_index Optional, default is 2. Tabindex for textarea element.
+ * @param string $content Initial content for the editor.
+ * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE. Can only be /[a-z]+/.
+ * @param array $settings See _WP_Editors::editor().
*/
-function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
- $rows = get_option('default_post_edit_rows');
- if (($rows < 3) || ($rows > 100))
- $rows = 12;
-
- if ( !current_user_can( 'upload_files' ) )
- $media_buttons = false;
-
- $richedit = user_can_richedit();
- $class = '';
-
- if ( $richedit || $media_buttons ) { ?>
-
-
-
-
-
-
-
\n");
- $the_editor_content = apply_filters('the_editor_content', $content);
-
- printf($the_editor, $the_editor_content);
-
-?>
-
-$n_display";
$dots = true;
elseif ( $dots && !$show_all ) :
- $page_links[] = '