@@ -199,7 +199,7 @@ function wp_loginout($redirect = '', $echo = true) {
*
* Returns the URL that allows the user to log out of the site
*
- * @since 2.7
+ * @since 2.7.0
* @uses wp_nonce_url() To protect against CSRF
* @uses site_url() To generate the log in URL
* @uses apply_filters() calls 'logout_url' hook on final logout url
@@ -223,7 +223,7 @@ function wp_logout_url($redirect = '') {
*
* Returns the URL that allows the user to log in to the site
*
- * @since 2.7
+ * @since 2.7.0
* @uses site_url() To generate the log in URL
* @uses apply_filters() calls 'login_url' hook on final login url
*
@@ -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,8 +270,8 @@ function wp_login_form( $args = array() ) {
$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
$form = '
-
';
if ( $args['echo'] )
@@ -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 );
}
/**
@@ -381,7 +381,7 @@ function bloginfo( $show='' ) {
*
* The possible values for the 'show' parameter are listed below.
*
- * - url - Blog URI to homepage.
+ * - url - Blog URI to homepage.
* - wpurl - Blog URI path to WordPress.
* - description - Secondary title
*
@@ -491,6 +491,18 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
return $output;
}
+/**
+ * Retrieve the current blog id
+ *
+ * @since 3.1.0
+ *
+ * @return int Blog id
+ */
+function get_current_blog_id() {
+ global $blog_id;
+ return absint($blog_id);
+}
+
/**
* Display or retrieve page title for all areas of blog.
*
@@ -514,13 +526,8 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
* @return string|null String on retrieve, null when displaying.
*/
function wp_title($sep = '»', $display = true, $seplocation = '') {
- global $wpdb, $wp_locale, $wp_query;
+ global $wpdb, $wp_locale;
- $cat = get_query_var('cat');
- $tag = get_query_var('tag_id');
- $category_name = get_query_var('category_name');
- $author = get_query_var('author');
- $author_name = get_query_var('author_name');
$m = get_query_var('m');
$year = get_query_var('year');
$monthnum = get_query_var('monthnum');
@@ -530,51 +537,43 @@ function wp_title($sep = '»', $display = true, $seplocation = '') {
$t_sep = '%WP_TITILE_SEP%'; // Temporary separator, for accurate flipping, if necessary
- // If there's a category
- if ( !empty($cat) ) {
- // category exclusion
- if ( !stristr($cat,'-') )
- $title = apply_filters('single_cat_title', get_the_category_by_ID($cat));
- } elseif ( !empty($category_name) ) {
- if ( stristr($category_name,'/') ) {
- $category_name = explode('/',$category_name);
- if ( $category_name[count($category_name)-1] )
- $category_name = $category_name[count($category_name)-1]; // no trailing slash
- else
- $category_name = $category_name[count($category_name)-2]; // there was a trailling slash
- }
- $cat = get_term_by('slug', $category_name, 'category', OBJECT, 'display');
- if ( $cat )
- $title = apply_filters('single_cat_title', $cat->name);
+ // If there is a post
+ if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
+ $title = single_post_title( '', false );
}
- if ( !empty($tag) ) {
- $tag = get_term($tag, 'post_tag', OBJECT, 'display');
- if ( is_wp_error( $tag ) )
- return $tag;
- if ( ! empty($tag->name) )
- $title = apply_filters('single_tag_title', $tag->name);
+ // If there's a category or tag
+ if ( is_category() || is_tag() ) {
+ $title = single_term_title( '', false );
}
- // If there's an author
- if ( !empty($author) ) {
- $title = get_userdata($author);
- $title = $title->display_name;
+ // If there's a taxonomy
+ if ( is_tax() ) {
+ $term = get_queried_object();
+ $tax = get_taxonomy( $term->taxonomy );
+ $title = single_term_title( $tax->labels->name . $t_sep, false );
}
- if ( !empty($author_name) ) {
- // We do a direct query here because we don't cache by nicename.
- $title = $wpdb->get_var($wpdb->prepare("SELECT display_name FROM $wpdb->users WHERE user_nicename = %s", $author_name));
+
+ // If there's an author
+ if ( is_author() ) {
+ $author = get_queried_object();
+ $title = $author->display_name;
}
+ // If there's a post type archive
+ if ( is_post_type_archive() )
+ $title = post_type_archive_title( '', false );
+
// If there's a month
- if ( !empty($m) ) {
+ if ( is_archive() && !empty($m) ) {
$my_year = substr($m, 0, 4);
$my_month = $wp_locale->get_month(substr($m, 4, 2));
$my_day = intval(substr($m, 6, 2));
- $title = $my_year . ($my_month ? $t_sep . $my_month : "") . ($my_day ? $t_sep . $my_day : "");
+ $title = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
}
- if ( !empty($year) ) {
+ // If there's a year
+ if ( is_archive() && !empty($year) ) {
$title = $year;
if ( !empty($monthnum) )
$title .= $t_sep . $wp_locale->get_month($monthnum);
@@ -582,27 +581,13 @@ function wp_title($sep = '»', $display = true, $seplocation = '') {
$title .= $t_sep . zeroise($day, 2);
}
- // If there is a post
- if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
- $post = $wp_query->get_queried_object();
- $title = apply_filters( 'single_post_title', $post->post_title );
- }
-
- // If there's a taxonomy
- if ( is_tax() ) {
- $taxonomy = get_query_var( 'taxonomy' );
- $tax = get_taxonomy( $taxonomy );
- $term = $wp_query->get_queried_object();
- $term = $term->name;
- $title = $tax->labels->name . $t_sep . $term;
- }
-
- //If it's a search
+ // If it's a search
if ( is_search() ) {
/* translators: 1: separator, 2: search phrase */
$title = sprintf(__('Search Results %1$s %2$s'), $t_sep, strip_tags($search));
}
+ // If it's a 404 page
if ( is_404() ) {
$title = __('Page not found');
}
@@ -635,7 +620,6 @@ function wp_title($sep = '»', $display = true, $seplocation = '') {
* Display or retrieve page title for post.
*
* This is optimized for single.php template file for displaying the post title.
- * Only useful for posts, does not support pages for example.
*
* It does not support placing the separator after the title, but by leaving the
* prefix parameter empty, you can set the title separator manually. The prefix
@@ -643,19 +627,13 @@ function wp_title($sep = '»', $display = true, $seplocation = '') {
* be a space, the parameter value will need to have it at the end.
*
* @since 0.71
- * @uses $wpdb
*
* @param string $prefix Optional. What to display before the title.
* @param bool $display Optional, default is true. Whether to display or retrieve title.
* @return string|null Title when retrieving, null when displaying or failure.
*/
function single_post_title($prefix = '', $display = true) {
- global $wp_query, $post;
-
- if ( ! $post )
- $_post = $wp_query->get_queried_object();
- else
- $_post = $post;
+ $_post = get_queried_object();
if ( !isset($_post->post_title) )
return;
@@ -667,6 +645,31 @@ function single_post_title($prefix = '', $display = true) {
return $title;
}
+/**
+ * Display or retrieve title for a post type archive.
+ *
+ * This is optimized for archive.php and archive-{$post_type}.php template files
+ * for displaying the title of the post type.
+ *
+ * @since 3.1.0
+ *
+ * @param string $prefix Optional. What to display before the title.
+ * @param bool $display Optional, default is true. Whether to display or retrieve title.
+ * @return string|null Title when retrieving, null when displaying or failure.
+ */
+function post_type_archive_title( $prefix = '', $display = true ) {
+ if ( ! is_post_type_archive() )
+ return;
+
+ $post_type_obj = get_queried_object();
+ $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
+
+ if ( $display )
+ echo $prefix . $title;
+ else
+ return $title;
+}
+
/**
* Display or retrieve page title for category archive.
*
@@ -684,23 +687,8 @@ function single_post_title($prefix = '', $display = true) {
* @param bool $display Optional, default is true. Whether to display or retrieve title.
* @return string|null Title when retrieving, null when displaying or failure.
*/
-function single_cat_title($prefix = '', $display = true ) {
- global $wp_query;
-
- if ( is_tag() )
- return single_tag_title($prefix, $display);
-
- if ( !is_category() )
- return;
-
- $cat = $wp_query->get_queried_object();
- $my_cat_name = apply_filters('single_cat_title', $cat->name);
- if ( !empty($my_cat_name) ) {
- if ( $display )
- echo $prefix . $my_cat_name;
- else
- return $my_cat_name;
- }
+function single_cat_title( $prefix = '', $display = true ) {
+ return single_term_title( $prefix, $display );
}
/**
@@ -720,23 +708,49 @@ function single_cat_title($prefix = '', $display = true ) {
* @param bool $display Optional, default is true. Whether to display or retrieve title.
* @return string|null Title when retrieving, null when displaying or failure.
*/
-function single_tag_title($prefix = '', $display = true ) {
- global $wp_query;
- if ( !is_tag() )
+function single_tag_title( $prefix = '', $display = true ) {
+ return single_term_title( $prefix, $display );
+}
+
+/**
+ * Display or retrieve page title for taxonomy term archive.
+ *
+ * Useful for taxonomy term template files for displaying the taxonomy term page title.
+ * It has less overhead than {@link wp_title()}, because of its limited implementation.
+ *
+ * It does not support placing the separator after the title, but by leaving the
+ * prefix parameter empty, you can set the title separator manually. The prefix
+ * does not automatically place a space between the prefix, so if there should
+ * be a space, the parameter value will need to have it at the end.
+ *
+ * @since 3.1.0
+ *
+ * @param string $prefix Optional. What to display before the title.
+ * @param bool $display Optional, default is true. Whether to display or retrieve title.
+ * @return string|null Title when retrieving, null when displaying or failure.
+ */
+function single_term_title( $prefix = '', $display = true ) {
+ $term = get_queried_object();
+
+ if ( !$term )
return;
- $tag = $wp_query->get_queried_object();
+ if ( is_category() )
+ $term_name = apply_filters( 'single_cat_title', $term->name );
+ elseif ( is_tag() )
+ $term_name = apply_filters( 'single_tag_title', $term->name );
+ elseif ( is_tax() )
+ $term_name = apply_filters( 'single_term_title', $term->name );
+ else
+ return;
- if ( ! $tag )
+ if ( empty( $term_name ) )
return;
- $my_tag_name = apply_filters('single_tag_title', $tag->name);
- if ( !empty($my_tag_name) ) {
- if ( $display )
- echo $prefix . $my_tag_name;
- else
- return $my_tag_name;
- }
+ if ( $display )
+ echo $prefix . $term_name;
+ else
+ return $term_name;
}
/**
@@ -829,7 +843,7 @@ function get_archives_link($url, $text, $format = 'html', $before = '', $after =
else // custom
$link_html = "\t$before
$text$after\n";
- $link_html = apply_filters( "get_archives_link", $link_html );
+ $link_html = apply_filters( 'get_archives_link', $link_html );
return $link_html;
}
@@ -901,8 +915,8 @@ function wp_get_archives($args = '') {
}
//filters
- $where = apply_filters('getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
- $join = apply_filters('getarchives_join', "", $r);
+ $where = apply_filters( 'getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
+ $join = apply_filters( 'getarchives_join', '', $r );
$output = '';
@@ -1002,7 +1016,7 @@ function wp_get_archives($args = '') {
}
}
} elseif ( ( 'postbypost' == $type ) || ('alpha' == $type) ) {
- $orderby = ('alpha' == $type) ? "post_title ASC " : "post_date DESC ";
+ $orderby = ('alpha' == $type) ? 'post_title ASC ' : 'post_date DESC ';
$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
$key = md5($query);
$cache = wp_cache_get( 'wp_get_archives' , 'general');
@@ -1016,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);
@@ -1101,7 +1114,7 @@ function get_calendar($initial = true, $echo = true) {
// We need to get the month from MySQL
$thisyear = ''.intval(substr($m, 0, 4));
$d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
- $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
+ $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
} elseif ( !empty($m) ) {
$thisyear = ''.intval(substr($m, 0, 4));
if ( strlen($m) < 6 )
@@ -1114,25 +1127,25 @@ function get_calendar($initial = true, $echo = true) {
}
$unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear);
+ $last_day = date('t', $unixmonth);
// Get the next and previous month and year with at least one post
- $previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+ $previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
FROM $wpdb->posts
WHERE post_date < '$thisyear-$thismonth-01'
AND post_type = 'post' AND post_status = 'publish'
ORDER BY post_date DESC
LIMIT 1");
- $next = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+ $next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
FROM $wpdb->posts
- WHERE post_date > '$thisyear-$thismonth-01'
- AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
+ WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
AND post_type = 'post' AND post_status = 'publish'
- ORDER BY post_date ASC
+ ORDER BY post_date ASC
LIMIT 1");
/* translators: Calendar caption: 1: month name, 2: 4-digit year */
$calendar_caption = _x('%1$s %2$s', 'calendar caption');
- $calendar_output = '
+ $calendar_output = '
' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '
';
@@ -1157,7 +1170,7 @@ function get_calendar($initial = true, $echo = true) {
';
if ( $previous ) {
- $calendar_output .= "\n\t\t".'| « ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . ' | ';
+ $calendar_output .= "\n\t\t".'« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . ' | ';
} else {
$calendar_output .= "\n\t\t".' | ';
}
@@ -1179,10 +1192,9 @@ function get_calendar($initial = true, $echo = true) {
// Get days with posts
$dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
- FROM $wpdb->posts WHERE MONTH(post_date) = '$thismonth'
- AND YEAR(post_date) = '$thisyear'
+ FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
AND post_type = 'post' AND post_status = 'publish'
- AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
+ AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
if ( $dayswithposts ) {
foreach ( (array) $dayswithposts as $daywith ) {
$daywithpost[] = $daywith[0];
@@ -1199,9 +1211,8 @@ function get_calendar($initial = true, $echo = true) {
$ak_titles_for_day = array();
$ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom "
."FROM $wpdb->posts "
- ."WHERE YEAR(post_date) = '$thisyear' "
- ."AND MONTH(post_date) = '$thismonth' "
- ."AND post_date < '".current_time('mysql')."' "
+ ."WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00' "
+ ."AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59' "
."AND post_type = 'post' AND post_status = 'publish'"
);
if ( $ak_post_titles ) {
@@ -1236,7 +1247,7 @@ function get_calendar($initial = true, $echo = true) {
$calendar_output .= '';
if ( in_array($day, $daywithpost) ) // any posts today?
- $calendar_output .= '$day";
+ $calendar_output .= '$day";
else
$calendar_output .= $day;
$calendar_output .= ' | ';
@@ -1318,7 +1329,7 @@ function the_date_xml() {
*
* Will only output the date if the current post's date is different from the
* previous one output.
-
+ *
* i.e. Only one date listing will show per day worth of posts shown in the loop, even if the
* function is called several times for each post.
*
@@ -1334,13 +1345,13 @@ function the_date_xml() {
* @return string|null Null if displaying, string if retrieving.
*/
function the_date( $d = '', $before = '', $after = '', $echo = true ) {
- global $day, $previousday;
+ global $currentday, $previousday;
$the_date = '';
- if ( $day != $previousday ) {
+ if ( $currentday != $previousday ) {
$the_date .= $before;
$the_date .= get_the_date( $d );
$the_date .= $after;
- $previousday = $day;
+ $previousday = $currentday;
$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
@@ -1542,15 +1553,15 @@ function the_weekday() {
*
* @param string $before Optional Output before the date.
* @param string $after Optional Output after the date.
- */
+ */
function the_weekday_date($before='',$after='') {
global $wp_locale, $post, $day, $previousweekday;
$the_weekday_date = '';
- if ( $day != $previousweekday ) {
+ if ( $currentday != $previousweekday ) {
$the_weekday_date .= $before;
$the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
$the_weekday_date .= $after;
- $previousweekday = $day;
+ $previousweekday = $currentday;
}
$the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
echo $the_weekday_date;
@@ -1628,35 +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() ) {
- $cat_id = intval( get_query_var('cat') );
+ $term = get_queried_object();
- $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
- $href = get_category_feed_link( $cat_id );
+ $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
+ $href = get_category_feed_link( $term->term_id );
} elseif ( is_tag() ) {
- $tag_id = intval( get_query_var('tag_id') );
- $tag = get_tag( $tag_id );
+ $term = get_queried_object();
- $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
- $href = get_tag_feed_link( $tag_id );
+ $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";
}
/**
@@ -1684,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";
}
/**
@@ -1721,16 +1747,18 @@ function rich_edit_exists() {
* @return bool
*/
function user_can_richedit() {
- global $wp_rich_edit, $pagenow;
-
- if ( !isset( $wp_rich_edit) ) {
- if ( get_user_option( 'rich_editing' ) == 'true' &&
- ( ( 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;
+ }
}
}
@@ -1757,78 +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) {
- $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 = '';
+function wp_editor( $content, $editor_id, $settings = array() ) {
+ if ( ! class_exists( '_WP_Editors' ) )
+ require( ABSPATH . WPINC . '/class-wp-editor.php' );
- if ( $richedit || $media_buttons ) { ?>
-
-
-
-
-
-
-\n");
- $the_editor_content = apply_filters('the_editor_content', $content);
-
- printf($the_editor, $the_editor_content);
-
-?>
-
-$prev_text";
+ $page_links[] = '' . $prev_text . '';
endif;
for ( $n = 1; $n <= $total; $n++ ) :
$n_display = number_format_i18n($n);
@@ -1995,7 +1974,7 @@ function paginate_links( $args = '' ) {
$page_links[] = "$n_display";
$dots = true;
elseif ( $dots && !$show_all ) :
- $page_links[] = "...";
+ $page_links[] = '' . __( '…' ) . '';
$dots = false;
endif;
endif;
@@ -2006,7 +1985,7 @@ function paginate_links( $args = '' ) {
if ( $add_args )
$link = add_query_arg( $add_args, $link );
$link .= $add_fragment;
- $page_links[] = "$next_text";
+ $page_links[] = '' . $next_text . '';
endif;
switch ( $type ) :
case 'array' :
@@ -2038,7 +2017,7 @@ function paginate_links( $args = '' ) {
* @param string $key The unique key for this theme.
* @param string $name The name of the theme.
* @param string $url The url of the css file containing the colour scheme.
- * @param array @colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
+ * @param array $colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
*/
function wp_admin_css_color($key, $name, $url, $colors = array()) {
global $_wp_admin_css_colors;
@@ -2055,8 +2034,11 @@ function wp_admin_css_color($key, $name, $url, $colors = array()) {
* @since 3.0.0
*/
function register_admin_color_schemes() {
- wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7'));
- wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF'));}
+ wp_admin_css_color( 'classic', _x( 'Blue', 'admin color scheme' ), admin_url( 'css/colors-classic.css' ),
+ array( '#5589aa', '#cfdfe9', '#d1e5ee', '#eff8ff' ) );
+ wp_admin_css_color( 'fresh', _x( 'Gray', 'admin color scheme' ), admin_url( 'css/colors-fresh.css' ),
+ array( '#7c7976', '#c6c6c6', '#e0e0e0', '#f1f1f1' ) );
+}
/**
* Display the URL of a WordPress admin CSS file.
@@ -2096,7 +2078,8 @@ function wp_admin_css_uri( $file = 'wp-admin' ) {
* @since 2.3.0
* @uses $wp_styles WordPress Styles Object
*
- * @param string $file Style handle name or file name (without ".css" extension) relative to wp-admin/
+ * @param string $file Optional. Style handle name or file name (without ".css" extension) relative
+ * to wp-admin/. Defaults to 'wp-admin'.
* @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
*/
function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
@@ -2132,6 +2115,9 @@ function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
function add_thickbox() {
wp_enqueue_script( 'thickbox' );
wp_enqueue_style( 'thickbox' );
+
+ if ( is_network_admin() )
+ add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
}
/**
@@ -2218,7 +2204,7 @@ function get_the_generator( $type = '' ) {
$gen = '';
break;
case 'export':
- $gen = '';
+ $gen = '';
break;
}
return apply_filters( "get_the_generator_{$type}", $gen, $type );
@@ -2229,7 +2215,7 @@ function get_the_generator( $type = '' ) {
*
* Compares the first two arguments and if identical marks as checked
*
- * @since 1.0
+ * @since 1.0.0
*
* @param mixed $checked One of the values to compare
* @param mixed $current (true) The other value to compare if not just true
@@ -2245,9 +2231,9 @@ function checked( $checked, $current = true, $echo = true ) {
*
* Compares the first two arguments and if identical marks as selected
*
- * @since 1.0
+ * @since 1.0.0
*
- * @param mixed selected One of the values to compare
+ * @param mixed $selected One of the values to compare
* @param mixed $current (true) The other value to compare if not just true
* @param bool $echo Whether to echo or just return the string
* @return string html attribute or empty string
@@ -2277,7 +2263,7 @@ function disabled( $disabled, $current = true, $echo = true ) {
*
* Compares the first two arguments and if identical marks as $type
*
- * @since 2.8
+ * @since 2.8.0
* @access private
*
* @param any $helper One of the values to compare