X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-includes/general-template.php
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 19726961..b5867624 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -25,7 +25,8 @@ function get_header( $name = null ) {
do_action( 'get_header', $name );
$templates = array();
- if ( isset($name) )
+ $name = (string) $name;
+ if ( '' !== $name )
$templates[] = "header-{$name}.php";
$templates[] = 'header.php';
@@ -54,7 +55,8 @@ function get_footer( $name = null ) {
do_action( 'get_footer', $name );
$templates = array();
- if ( isset($name) )
+ $name = (string) $name;
+ if ( '' !== $name )
$templates[] = "footer-{$name}.php";
$templates[] = 'footer.php';
@@ -83,7 +85,8 @@ function get_sidebar( $name = null ) {
do_action( 'get_sidebar', $name );
$templates = array();
- if ( isset($name) )
+ $name = (string) $name;
+ if ( '' !== $name )
$templates[] = "sidebar-{$name}.php";
$templates[] = 'sidebar.php';
@@ -120,7 +123,8 @@ function get_template_part( $slug, $name = null ) {
do_action( "get_template_part_{$slug}", $slug, $name );
$templates = array();
- if ( isset($name) )
+ $name = (string) $name;
+ if ( '' !== $name )
$templates[] = "{$slug}-{$name}.php";
$templates[] = "{$slug}.php";
@@ -141,33 +145,56 @@ function get_template_part( $slug, $name = null ) {
* form into the sidebar and also by the search widget in WordPress.
*
* There is also an action that is called whenever the function is run called,
- * 'get_search_form'. This can be useful for outputting JavaScript that the
+ * 'pre_get_search_form'. This can be useful for outputting JavaScript that the
* search relies on or various formatting that applies to the beginning of the
* search. To give a few examples of what it can be used for.
*
* @since 2.7.0
+ * @uses apply_filters() Calls 'search_form_format' filter to determine which type to use for the search field.
+ * If set to 'html5', it changes to search input type and adds placeholder text.
+ *
* @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.
*/
-function get_search_form($echo = true) {
- do_action( 'get_search_form' );
+function get_search_form( $echo = true ) {
+ do_action( 'pre_get_search_form' );
+
+ $format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
+ $format = apply_filters( 'search_form_format', $format );
- $search_form_template = locate_template('searchform.php');
+ $search_form_template = locate_template( 'searchform.php' );
if ( '' != $search_form_template ) {
- require($search_form_template);
- return;
+ ob_start();
+ require( $search_form_template );
+ $form = ob_get_clean();
+ } else {
+ if ( 'html5' == $format ) {
+ $form = '';
+ } else {
+ $form = '';
+ }
}
- $form = '';
+ $result = apply_filters( 'get_search_form', $form );
+ if ( null === $result )
+ $result = $form;
if ( $echo )
- echo apply_filters('get_search_form', $form);
+ echo $result;
else
- return apply_filters('get_search_form', $form);
+ return $result;
}
/**
@@ -181,6 +208,7 @@ function get_search_form($echo = true) {
*
* @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.
*/
function wp_loginout($redirect = '', $echo = true) {
if ( ! is_user_logged_in() )
@@ -197,14 +225,15 @@ function wp_loginout($redirect = '', $echo = true) {
/**
* Returns the Log Out URL.
*
- * Returns the URL that allows the user to log out of the site
+ * Returns the URL that allows the user to log out of the site.
*
* @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
+ * @uses wp_nonce_url() To protect against CSRF.
+ * @uses site_url() To generate the log out URL.
+ * @uses apply_filters() calls 'logout_url' hook on final logout URL.
*
* @param string $redirect Path to redirect to on logout.
+ * @return string A log out URL.
*/
function wp_logout_url($redirect = '') {
$args = array( 'action' => 'logout' );
@@ -221,15 +250,15 @@ function wp_logout_url($redirect = '') {
/**
* Returns the Log In URL.
*
- * Returns the URL that allows the user to log in to the site
+ * 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
- * @uses apply_filters() calls 'login_url' hook on final login url
+ * @uses site_url() To generate the log in URL.
+ * @uses apply_filters() calls 'login_url' hook on final login 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.
- * @return string A log in url
+ * @return string A log in URL.
*/
function wp_login_url($redirect = '', $force_reauth = false) {
$login_url = site_url('wp-login.php', 'login');
@@ -243,30 +272,46 @@ function wp_login_url($redirect = '', $force_reauth = false) {
return apply_filters('login_url', $login_url, $redirect);
}
+/**
+ * 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.
+ * @uses apply_filters() calls 'register_url' hook on final URL.
+ *
+ * @return string
+ */
+function wp_registration_url() {
+ return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', 'login' ) );
+}
+
/**
* 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.
*
* @since 3.0.0
- * @param array $args Configuration options to modify the form output
- * @return Void, or string containing the form
+ * @param array $args Configuration options to modify the form output.
+ * @return string|null String when retrieving, null when displaying.
*/
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
- 'form_id' => 'loginform',
- 'label_username' => __( 'Username' ),
- 'label_password' => __( 'Password' ),
- 'label_remember' => __( 'Remember Me' ),
- 'label_log_in' => __( 'Log In' ),
- 'id_username' => 'user_login',
- 'id_password' => 'user_pass',
- 'id_remember' => 'rememberme',
- 'id_submit' => 'wp-submit',
- 'remember' => true,
- 'value_username' => '',
- 'value_remember' => false, // Set this to true to default the "Remember me" checkbox to checked
- );
+ $defaults = array(
+ 'echo' => true,
+ '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' ),
+ 'label_remember' => __( 'Remember Me' ),
+ 'label_log_in' => __( 'Log In' ),
+ 'id_username' => 'user_login',
+ 'id_password' => 'user_pass',
+ 'id_remember' => 'rememberme',
+ 'id_submit' => 'wp-submit',
+ 'remember' => true,
+ 'value_username' => '',
+ 'value_remember' => false, // Set this to true to default the "Remember me" checkbox to checked
+ );
$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
$form = '
@@ -274,16 +319,16 @@ function wp_login_form( $args = array() ) {
' . apply_filters( 'login_form_top', '', $args ) . '
' . apply_filters( 'login_form_bottom', '', $args ) . '
@@ -305,6 +350,7 @@ function wp_login_form( $args = array() ) {
* @uses apply_filters() calls 'lostpassword_url' hook on the lostpassword url
*
* @param string $redirect Path to redirect to on login.
+ * @return string Lost password URL.
*/
function wp_lostpassword_url( $redirect = '' ) {
$args = array( 'action' => 'lostpassword' );
@@ -328,12 +374,13 @@ function wp_lostpassword_url( $redirect = '' ) {
* @param string $before Text to output before the link (defaults to
).
* @param string $after Text to output after the link (defaults to
).
* @param boolean $echo Default to echo and not return the link.
+ * @return string|null String when retrieving, null when displaying.
*/
function wp_register( $before = '
', $after = '
', $echo = true ) {
if ( ! is_user_logged_in() ) {
if ( get_option('users_can_register') )
- $link = $before . '' . __('Register') . '' . $after;
+ $link = $before . '' . __('Register') . '' . $after;
else
$link = '';
} else {
@@ -491,18 +538,6 @@ 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.
*
@@ -873,6 +908,7 @@ function get_archives_link($url, $text, $format = 'html', $before = '', $after =
* @since 1.2.0
*
* @param string|array $args Optional. Override defaults.
+ * @return string|null String when retrieving, null when displaying.
*/
function wp_get_archives($args = '') {
global $wpdb, $wp_locale;
@@ -881,7 +917,7 @@ function wp_get_archives($args = '') {
'type' => 'monthly', 'limit' => '',
'format' => 'html', 'before' => '',
'after' => '', 'show_post_count' => false,
- 'echo' => 1
+ 'echo' => 1, 'order' => 'DESC',
);
$r = wp_parse_args( $args, $defaults );
@@ -895,6 +931,10 @@ function wp_get_archives($args = '') {
$limit = ' LIMIT '.$limit;
}
+ $order = strtoupper( $order );
+ if ( $order !== 'ASC' )
+ $order = 'DESC';
+
// this is what will separate dates on weekly archive links
$archive_week_separator = '–';
@@ -914,103 +954,97 @@ function wp_get_archives($args = '') {
$archive_week_end_date_format = get_option('date_format');
}
- //filters
$where = apply_filters( 'getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
$join = apply_filters( 'getarchives_join', '', $r );
$output = '';
+ $last_changed = wp_cache_get( 'last_changed', 'posts' );
+ if ( ! $last_changed ) {
+ $last_changed = microtime();
+ wp_cache_set( 'last_changed', $last_changed, 'posts' );
+ }
+
if ( 'monthly' == $type ) {
- $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
- $key = md5($query);
- $cache = wp_cache_get( 'wp_get_archives' , 'general');
- if ( !isset( $cache[ $key ] ) ) {
- $arcresults = $wpdb->get_results($query);
- $cache[ $key ] = $arcresults;
- wp_cache_set( 'wp_get_archives', $cache, 'general' );
- } else {
- $arcresults = $cache[ $key ];
+ $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
+ $key = md5( $query );
+ $key = "wp_get_archives:$key:$last_changed";
+ if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
+ $results = $wpdb->get_results( $query );
+ wp_cache_set( $key, $results, 'posts' );
}
- if ( $arcresults ) {
+ if ( $results ) {
$afterafter = $after;
- foreach ( (array) $arcresults as $arcresult ) {
- $url = get_month_link( $arcresult->year, $arcresult->month );
+ foreach ( (array) $results as $result ) {
+ $url = get_month_link( $result->year, $result->month );
/* translators: 1: month name, 2: 4-digit year */
- $text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($arcresult->month), $arcresult->year);
+ $text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
if ( $show_post_count )
- $after = ' ('.$arcresult->posts.')' . $afterafter;
+ $after = ' ('.$result->posts.')' . $afterafter;
$output .= get_archives_link($url, $text, $format, $before, $after);
}
}
} elseif ('yearly' == $type) {
- $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
- $key = md5($query);
- $cache = wp_cache_get( 'wp_get_archives' , 'general');
- if ( !isset( $cache[ $key ] ) ) {
- $arcresults = $wpdb->get_results($query);
- $cache[ $key ] = $arcresults;
- wp_cache_set( 'wp_get_archives', $cache, 'general' );
- } else {
- $arcresults = $cache[ $key ];
+ $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
+ $key = md5( $query );
+ $key = "wp_get_archives:$key:$last_changed";
+ if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
+ $results = $wpdb->get_results( $query );
+ wp_cache_set( $key, $results, 'posts' );
}
- if ($arcresults) {
+ if ( $results ) {
$afterafter = $after;
- foreach ( (array) $arcresults as $arcresult) {
- $url = get_year_link($arcresult->year);
- $text = sprintf('%d', $arcresult->year);
+ foreach ( (array) $results as $result) {
+ $url = get_year_link($result->year);
+ $text = sprintf('%d', $result->year);
if ($show_post_count)
- $after = ' ('.$arcresult->posts.')' . $afterafter;
+ $after = ' ('.$result->posts.')' . $afterafter;
$output .= get_archives_link($url, $text, $format, $before, $after);
}
}
} elseif ( 'daily' == $type ) {
- $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
- $key = md5($query);
- $cache = wp_cache_get( 'wp_get_archives' , 'general');
- if ( !isset( $cache[ $key ] ) ) {
- $arcresults = $wpdb->get_results($query);
- $cache[ $key ] = $arcresults;
- wp_cache_set( 'wp_get_archives', $cache, 'general' );
- } else {
- $arcresults = $cache[ $key ];
+ $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
+ $key = md5( $query );
+ $key = "wp_get_archives:$key:$last_changed";
+ if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
+ $results = $wpdb->get_results( $query );
+ $cache[ $key ] = $results;
+ wp_cache_set( $key, $results, 'posts' );
}
- if ( $arcresults ) {
+ if ( $results ) {
$afterafter = $after;
- foreach ( (array) $arcresults as $arcresult ) {
- $url = get_day_link($arcresult->year, $arcresult->month, $arcresult->dayofmonth);
- $date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $arcresult->year, $arcresult->month, $arcresult->dayofmonth);
+ foreach ( (array) $results as $result ) {
+ $url = get_day_link($result->year, $result->month, $result->dayofmonth);
+ $date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
$text = mysql2date($archive_day_date_format, $date);
if ($show_post_count)
- $after = ' ('.$arcresult->posts.')'.$afterafter;
+ $after = ' ('.$result->posts.')'.$afterafter;
$output .= get_archives_link($url, $text, $format, $before, $after);
}
}
} elseif ( 'weekly' == $type ) {
$week = _wp_mysql_week( '`post_date`' );
- $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` DESC $limit";
- $key = md5($query);
- $cache = wp_cache_get( 'wp_get_archives' , 'general');
- if ( !isset( $cache[ $key ] ) ) {
- $arcresults = $wpdb->get_results($query);
- $cache[ $key ] = $arcresults;
- wp_cache_set( 'wp_get_archives', $cache, 'general' );
- } else {
- $arcresults = $cache[ $key ];
+ $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
+ $key = md5( $query );
+ $key = "wp_get_archives:$key:$last_changed";
+ if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
+ $results = $wpdb->get_results( $query );
+ wp_cache_set( $key, $results, 'posts' );
}
$arc_w_last = '';
$afterafter = $after;
- if ( $arcresults ) {
- foreach ( (array) $arcresults as $arcresult ) {
- if ( $arcresult->week != $arc_w_last ) {
- $arc_year = $arcresult->yr;
- $arc_w_last = $arcresult->week;
- $arc_week = get_weekstartend($arcresult->yyyymmdd, get_option('start_of_week'));
+ if ( $results ) {
+ foreach ( (array) $results as $result ) {
+ if ( $result->week != $arc_w_last ) {
+ $arc_year = $result->yr;
+ $arc_w_last = $result->week;
+ $arc_week = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
- $url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $arcresult->week);
+ $url = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week);
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
if ($show_post_count)
- $after = ' ('.$arcresult->posts.')'.$afterafter;
+ $after = ' ('.$result->posts.')'.$afterafter;
$output .= get_archives_link($url, $text, $format, $before, $after);
}
}
@@ -1018,23 +1052,20 @@ function wp_get_archives($args = '') {
} elseif ( ( 'postbypost' == $type ) || ('alpha' == $type) ) {
$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');
- if ( !isset( $cache[ $key ] ) ) {
- $arcresults = $wpdb->get_results($query);
- $cache[ $key ] = $arcresults;
- wp_cache_set( 'wp_get_archives', $cache, 'general' );
- } else {
- $arcresults = $cache[ $key ];
+ $key = md5( $query );
+ $key = "wp_get_archives:$key:$last_changed";
+ if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
+ $results = $wpdb->get_results( $query );
+ wp_cache_set( $key, $results, 'posts' );
}
- if ( $arcresults ) {
- foreach ( (array) $arcresults as $arcresult ) {
- if ( $arcresult->post_date != '0000-00-00 00:00:00' ) {
- $url = get_permalink( $arcresult );
- if ( $arcresult->post_title )
- $text = strip_tags( apply_filters( 'the_title', $arcresult->post_title, $arcresult->ID ) );
+ if ( $results ) {
+ foreach ( (array) $results as $result ) {
+ if ( $result->post_date != '0000-00-00 00:00:00' ) {
+ $url = get_permalink( $result );
+ if ( $result->post_title )
+ $text = strip_tags( apply_filters( 'the_title', $result->post_title, $result->ID ) );
else
- $text = $arcresult->ID;
+ $text = $result->ID;
$output .= get_archives_link($url, $text, $format, $before, $after);
}
}
@@ -1050,7 +1081,6 @@ function wp_get_archives($args = '') {
* Get number of days since the start of the week.
*
* @since 1.5.0
- * @usedby get_calendar()
*
* @param int $num Number of day.
* @return int Days since the start of the week.
@@ -1067,9 +1097,11 @@ function calendar_week_mod($num) {
* no posts for the month, then it will not be displayed.
*
* @since 1.0.0
+ * @uses calendar_week_mod()
*
* @param bool $initial Optional, default is true. Use initial calendar names.
* @param bool $echo Optional, default is true. Set to false for return.
+ * @return string|null String when retrieving, null when displaying.
*/
function get_calendar($initial = true, $echo = true) {
global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
@@ -1319,8 +1351,7 @@ function allowed_tags() {
* @since 1.0.0
*/
function the_date_xml() {
- global $post;
- echo mysql2date('Y-m-d', $post->post_date, false);
+ echo mysql2date( 'Y-m-d', get_post()->post_date, false );
}
/**
@@ -1375,7 +1406,7 @@ function the_date( $d = '', $before = '', $after = '', $echo = true ) {
* @return string|null Null if displaying, string if retrieving.
*/
function get_the_date( $d = '' ) {
- global $post;
+ $post = get_post();
$the_date = '';
if ( '' == $d )
@@ -1536,8 +1567,8 @@ function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translat
* @uses $post
*/
function the_weekday() {
- global $wp_locale, $post;
- $the_weekday = $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
+ global $wp_locale;
+ $the_weekday = $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
$the_weekday = apply_filters('the_weekday', $the_weekday);
echo $the_weekday;
}
@@ -1554,11 +1585,11 @@ function the_weekday() {
* @param string $after Optional Output after the date.
*/
function the_weekday_date($before='',$after='') {
- global $wp_locale, $post, $day, $previousweekday;
+ global $wp_locale, $currentday, $previousweekday;
$the_weekday_date = '';
if ( $currentday != $previousweekday ) {
$the_weekday_date .= $before;
- $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
+ $the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
$the_weekday_date .= $after;
$previousweekday = $currentday;
}
@@ -1602,7 +1633,7 @@ function feed_links( $args = array() ) {
'separator' => _x('»', 'feed link'),
/* translators: 1: blog title, 2: separator (raquo) */
'feedtitle' => __('%1$s %2$s Feed'),
- /* translators: %s: blog title, 2: separator (raquo) */
+ /* translators: 1: blog title, 2: separator (raquo) */
'comstitle' => __('%1$s %2$s Comments Feed'),
);
@@ -1633,13 +1664,15 @@ function feed_links_extra( $args = array() ) {
'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
/* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
'searchtitle' => __('%1$s %2$s Search Results for “%3$s” Feed'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: post type name */
+ 'posttypetitle' => __('%1$s %2$s %3$s Feed'),
);
$args = wp_parse_args( $args, $defaults );
if ( is_single() || is_page() ) {
$id = 0;
- $post = &get_post( $id );
+ $post = get_post( $id );
if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
$title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) );
@@ -1663,6 +1696,9 @@ function feed_links_extra( $args = array() ) {
} elseif ( is_search() ) {
$title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
$href = get_search_feed_link();
+ } elseif ( is_post_type_archive() ) {
+ $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+ $href = get_post_type_archive_feed_link( get_queried_object()->name );
}
if ( isset($title) && isset($href) )
@@ -1754,7 +1790,7 @@ function user_can_richedit() {
if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
if ( $is_safari ) {
$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
- } elseif ( $is_gecko || $is_opera || $is_chrome || $is_IE ) {
+ } elseif ( $is_gecko || $is_chrome || $is_IE || ( $is_opera && !wp_is_mobile() ) ) {
$wp_rich_edit = true;
}
}
@@ -1767,7 +1803,7 @@ function user_can_richedit() {
* Find out which editor should be displayed by default.
*
* Works out which of the two editors to display as the current editor for a
- * user.
+ * user. The 'html' setting is for the "Text" editor tab.
*
* @since 2.5.0
*
@@ -1855,8 +1891,8 @@ function language_attributes($doctype = 'html') {
$attributes = array();
$output = '';
- if ( function_exists( 'is_rtl' ) )
- $attributes[] = 'dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"';
+ if ( function_exists( 'is_rtl' ) && is_rtl() )
+ $attributes[] = 'dir="rtl"';
if ( $lang = get_bloginfo('language') ) {
if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
@@ -2032,9 +2068,9 @@ function wp_admin_css_color($key, $name, $url, $colors = array()) {
* @since 3.0.0
*/
function register_admin_color_schemes() {
- wp_admin_css_color( 'classic', _x( 'Blue', 'admin color scheme' ), admin_url( 'css/colors-classic.css' ),
+ wp_admin_css_color( 'classic', _x( 'Blue', 'admin color scheme' ), admin_url( 'css/colors-classic.min.css' ),
array( '#5589aa', '#cfdfe9', '#d1e5ee', '#eff8ff' ) );
- wp_admin_css_color( 'fresh', _x( 'Gray', 'admin color scheme' ), admin_url( 'css/colors-fresh.css' ),
+ wp_admin_css_color( 'fresh', _x( 'Gray', 'admin color scheme' ), admin_url( 'css/colors-fresh.min.css' ),
array( '#555', '#a0a0a0', '#ccc', '#f1f1f1' ) );
}
@@ -2264,8 +2300,8 @@ function disabled( $disabled, $current = true, $echo = true ) {
* @since 2.8.0
* @access private
*
- * @param any $helper One of the values to compare
- * @param any $current (true) The other value to compare if not just true
+ * @param mixed $helper 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
* @param string $type The type of checked|selected|disabled we are doing
* @return string html attribute or empty string
@@ -2281,3 +2317,23 @@ function __checked_selected_helper( $helper, $current, $echo, $type ) {
return $result;
}
+
+/**
+ * Default settings for heartbeat
+ *
+ * Outputs the nonce used in the heartbeat XHR
+ *
+ * @since 3.6.0
+ *
+ * @param array $settings
+ * @return array $settings
+ */
+function wp_heartbeat_settings( $settings ) {
+ if ( ! is_admin() )
+ $settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+
+ if ( is_user_logged_in() )
+ $settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+
+ return $settings;
+}