--- a/web/wp-includes/general-template.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-includes/general-template.php Mon Nov 19 18:26:13 2012 +0100
@@ -10,8 +10,7 @@
* Load header template.
*
* Includes the header template for a theme or if a name is specified then a
- * specialised header will be included. If the theme contains no header.php file
- * then the header from the default theme will be included.
+ * specialised header will be included.
*
* For the parameter, if the file is called "header-special.php" then specify
* "special".
@@ -29,18 +28,18 @@
if ( isset($name) )
$templates[] = "header-{$name}.php";
- $templates[] = "header.php";
+ $templates[] = 'header.php';
+ // Backward compat code will be removed in a future release
if ('' == locate_template($templates, true))
- load_template( get_theme_root() . '/default/header.php');
+ load_template( ABSPATH . WPINC . '/theme-compat/header.php');
}
/**
* Load footer template.
*
* Includes the footer template for a theme or if a name is specified then a
- * specialised footer will be included. If the theme contains no footer.php file
- * then the footer from the default theme will be included.
+ * specialised footer will be included.
*
* For the parameter, if the file is called "footer-special.php" then specify
* "special".
@@ -58,18 +57,18 @@
if ( isset($name) )
$templates[] = "footer-{$name}.php";
- $templates[] = "footer.php";
+ $templates[] = 'footer.php';
+ // Backward compat code will be removed in a future release
if ('' == locate_template($templates, true))
- load_template( get_theme_root() . '/default/footer.php');
+ load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
}
/**
* Load sidebar template.
*
* Includes the sidebar template for a theme or if a name is specified then a
- * specialised sidebar will be included. If the theme contains no sidebar.php
- * file then the sidebar from the default theme will be included.
+ * specialised sidebar will be included.
*
* For the parameter, if the file is called "sidebar-special.php" then specify
* "special".
@@ -87,10 +86,46 @@
if ( isset($name) )
$templates[] = "sidebar-{$name}.php";
- $templates[] = "sidebar.php";
+ $templates[] = 'sidebar.php';
+
+ // Backward compat code will be removed in a future release
+ if ('' == locate_template($templates, true))
+ load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
+}
- if ('' == locate_template($templates, true))
- load_template( get_theme_root() . '/default/sidebar.php');
+/**
+ * Load a template part into a template
+ *
+ * Makes it easy for a theme to reuse sections of code in a easy to overload way
+ * for child themes.
+ *
+ * Includes the named template part for a theme or if a name is specified then a
+ * specialised part will be included. If the theme contains no {slug}.php file
+ * then no template will be included.
+ *
+ * The template is included using require, not require_once, so you may include the
+ * same template part multiple times.
+ *
+ * For the $name parameter, if the file is called "{slug}-special.php" then specify
+ * "special".
+ *
+ * @uses locate_template()
+ * @since 3.0.0
+ * @uses do_action() Calls 'get_template_part_{$slug}' action.
+ *
+ * @param string $slug The slug name for the generic template.
+ * @param string $name The name of the specialised template.
+ */
+function get_template_part( $slug, $name = null ) {
+ do_action( "get_template_part_{$slug}", $slug, $name );
+
+ $templates = array();
+ if ( isset($name) )
+ $templates[] = "{$slug}-{$name}.php";
+
+ $templates[] = "{$slug}.php";
+
+ locate_template($templates, true, false);
}
/**
@@ -111,44 +146,52 @@
* search. To give a few examples of what it can be used for.
*
* @since 2.7.0
+ * @param boolean $echo Default to echo and not return the form.
*/
-function get_search_form() {
+function get_search_form($echo = true) {
do_action( 'get_search_form' );
- $search_form_template = locate_template(array('searchform.php'));
+ $search_form_template = locate_template('searchform.php');
if ( '' != $search_form_template ) {
require($search_form_template);
return;
}
- $form = '<form role="search" method="get" id="searchform" action="' . get_option('home') . '/" >
+ $form = '<form role="search" method="get" id="searchform" action="' . esc_url( home_url( '/' ) ) . '" >
<div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
- <input type="text" value="' . esc_attr(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
+ <input type="text" value="' . get_search_query() . '" name="s" id="s" />
<input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</div>
</form>';
- echo apply_filters('get_search_form', $form);
+ if ( $echo )
+ echo apply_filters('get_search_form', $form);
+ else
+ return apply_filters('get_search_form', $form);
}
/**
* Display the Log In/Out link.
*
- * Displays a link, which allows the user to navigate to the Log In page to log in
- * or log out depending on whether or not they are currently logged in.
+ * Displays a link, which allows users to navigate to the Log In page to log in
+ * or log out depending on whether they are currently logged in.
*
* @since 1.5.0
* @uses apply_filters() Calls 'loginout' hook on HTML link content.
*
* @param string $redirect Optional path to redirect to on login/logout.
+ * @param boolean $echo Default to echo and not return the link.
*/
-function wp_loginout($redirect = '') {
+function wp_loginout($redirect = '', $echo = true) {
if ( ! is_user_logged_in() )
$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
else
$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
- echo apply_filters('loginout', $link);
+ if ( $echo )
+ echo apply_filters('loginout', $link);
+ else
+ return apply_filters('loginout', $link);
}
/**
@@ -156,7 +199,7 @@
*
* 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
@@ -180,23 +223,79 @@
*
* 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
*
* @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 = '') {
+function wp_login_url($redirect = '', $force_reauth = false) {
$login_url = site_url('wp-login.php', 'login');
- if ( !empty($redirect) ) {
+ if ( !empty($redirect) )
$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
- }
+
+ if ( $force_reauth )
+ $login_url = add_query_arg('reauth', '1', $login_url);
return apply_filters('login_url', $login_url, $redirect);
}
/**
+ * 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
+ */
+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
+ );
+ $args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
+
+ $form = '
+ <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
+ ' . apply_filters( 'login_form_top', '', $args ) . '
+ <p class="login-username">
+ <label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
+ <input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" tabindex="10" />
+ </p>
+ <p class="login-password">
+ <label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
+ <input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" tabindex="20" />
+ </p>
+ ' . apply_filters( 'login_form_middle', '', $args ) . '
+ ' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever" tabindex="90"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
+ <p class="login-submit">
+ <input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" tabindex="100" />
+ <input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
+ </p>
+ ' . apply_filters( 'login_form_bottom', '', $args ) . '
+ </form>';
+
+ if ( $args['echo'] )
+ echo $form;
+ else
+ return $form;
+}
+
+/**
* Returns the Lost Password URL.
*
* Returns the URL that allows the user to retrieve the lost password
@@ -207,14 +306,14 @@
*
* @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 );
}
/**
@@ -228,8 +327,9 @@
*
* @param string $before Text to output before the link (defaults to <li>).
* @param string $after Text to output after the link (defaults to </li>).
+ * @param boolean $echo Default to echo and not return the link.
*/
-function wp_register( $before = '<li>', $after = '</li>' ) {
+function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
if ( ! is_user_logged_in() ) {
if ( get_option('users_can_register') )
@@ -240,7 +340,10 @@
$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
}
- echo apply_filters('register', $link);
+ if ( $echo )
+ echo apply_filters('register', $link);
+ else
+ return apply_filters('register', $link);
}
/**
@@ -265,21 +368,20 @@
*
* @param string $show What to display.
*/
-function bloginfo($show='') {
- echo get_bloginfo($show, 'display');
+function bloginfo( $show='' ) {
+ echo get_bloginfo( $show, 'display' );
}
/**
* Retrieve information about the blog.
*
* Some show parameter values are deprecated and will be removed in future
- * versions. Care should be taken to check the function contents and know what
- * the deprecated blog info options are. Options without "// DEPRECATED" are
- * the preferred and recommended ways to get the information.
+ * versions. These options will trigger the _deprecated_argument() function.
+ * The deprecated blog info options are listed in the function contents.
*
* The possible values for the 'show' parameter are listed below.
* <ol>
- * <li><strong>url<strong> - Blog URI to homepage.</li>
+ * <li><strong>url</strong> - Blog URI to homepage.</li>
* <li><strong>wpurl</strong> - Blog URI path to WordPress.</li>
* <li><strong>description</strong> - Secondary title</li>
* </ol>
@@ -289,25 +391,23 @@
* comment feeds can be retrieved from the 'comments_atom_url' (Atom comment
* feed) or 'comments_rss2_url' (RSS 2.0 comment feed).
*
- * There are many other options and you should check the function contents:
- * {@source 32 37}
- *
* @since 0.71
*
* @param string $show Blog info to retrieve.
* @param string $filter How to filter what is retrieved.
* @return string Mostly string values, might be empty.
*/
-function get_bloginfo($show = '', $filter = 'raw') {
+function get_bloginfo( $show = '', $filter = 'raw' ) {
- switch($show) {
- case 'url' :
+ switch( $show ) {
case 'home' : // DEPRECATED
case 'siteurl' : // DEPRECATED
- $output = get_option('home');
+ _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url' ) );
+ case 'url' :
+ $output = home_url();
break;
case 'wpurl' :
- $output = get_option('siteurl');
+ $output = site_url();
break;
case 'description':
$output = get_option('blogdescription');
@@ -362,8 +462,12 @@
$output = str_replace('_', '-', $output);
break;
case 'text_direction':
- global $wp_locale;
- $output = $wp_locale->text_direction;
+ //_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> function instead.' ), 'is_rtl()' ) );
+ if ( function_exists( 'is_rtl' ) ) {
+ $output = is_rtl() ? 'rtl' : 'ltr';
+ } else {
+ $output = 'ltr';
+ }
break;
case 'name':
default:
@@ -388,6 +492,18 @@
}
/**
+ * 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.
*
* By default, the page title will display the separator before the page title,
@@ -410,13 +526,8 @@
* @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');
@@ -426,80 +537,57 @@
$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 ( !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 is a post
+ if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
+ $title = single_post_title( '', false );
}
- // If there's an author
- if ( !empty($author) ) {
- $title = get_userdata($author);
- $title = $title->display_name;
- }
- 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 a month
- if ( !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" : "");
- }
-
- if ( !empty($year) ) {
- $title = $year;
- if ( !empty($monthnum) )
- $title .= "$t_sep" . $wp_locale->get_month($monthnum);
- if ( !empty($day) )
- $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 = strip_tags( apply_filters( 'single_post_title', $post->post_title ) );
+ // If there's a category or tag
+ if ( is_category() || is_tag() ) {
+ $title = single_term_title( '', false );
}
// If there's a taxonomy
if ( is_tax() ) {
- $taxonomy = get_query_var( 'taxonomy' );
- $tax = get_taxonomy( $taxonomy );
- $tax = $tax->label;
- $term = $wp_query->get_queried_object();
- $term = $term->name;
- $title = "$tax$t_sep$term";
+ $term = get_queried_object();
+ $tax = get_taxonomy( $term->taxonomy );
+ $title = single_term_title( $tax->labels->name . $t_sep, false );
+ }
+
+ // If there's an author
+ if ( is_author() ) {
+ $author = get_queried_object();
+ $title = $author->display_name;
}
- //If it's a search
+ // If there's a post type archive
+ if ( is_post_type_archive() )
+ $title = post_type_archive_title( '', false );
+
+ // If there's a month
+ 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 : '' );
+ }
+
+ // If there's a year
+ if ( is_archive() && !empty($year) ) {
+ $title = $year;
+ if ( !empty($monthnum) )
+ $title .= $t_sep . $wp_locale->get_month($monthnum);
+ if ( !empty($day) )
+ $title .= $t_sep . zeroise($day, 2);
+ }
+
+ // 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');
}
@@ -532,7 +620,6 @@
* 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
@@ -540,28 +627,47 @@
* 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 $wpdb;
- $p = get_query_var('p');
- $name = get_query_var('name');
+ $_post = get_queried_object();
+
+ if ( !isset($_post->post_title) )
+ return;
+
+ $title = apply_filters('single_post_title', $_post->post_title, $_post);
+ if ( $display )
+ echo $prefix . $title;
+ else
+ return $title;
+}
- if ( intval($p) || '' != $name ) {
- if ( !$p )
- $p = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s", $name));
- $post = & get_post($p);
- $title = $post->post_title;
- $title = apply_filters('single_post_title', $title);
- if ( $display )
- echo $prefix.strip_tags($title);
- else
- return strip_tags($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;
}
/**
@@ -581,19 +687,8 @@
* @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 ) {
- $cat = intval( get_query_var('cat') );
- if ( !empty($cat) && !(strtoupper($cat) == 'ALL') ) {
- $my_cat_name = apply_filters('single_cat_title', get_the_category_by_ID($cat));
- if ( !empty($my_cat_name) ) {
- if ( $display )
- echo $prefix.strip_tags($my_cat_name);
- else
- return strip_tags($my_cat_name);
- }
- } else if ( is_tag() ) {
- return single_tag_title($prefix, $display);
- }
+function single_cat_title( $prefix = '', $display = true ) {
+ return single_term_title( $prefix, $display );
}
/**
@@ -613,24 +708,49 @@
* @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 ) {
- 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_id = intval( get_query_var('tag_id') );
+ 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 ( !empty($tag_id) ) {
- $my_tag = &get_term($tag_id, 'post_tag', OBJECT, 'display');
- if ( is_wp_error( $my_tag ) )
- return false;
- $my_tag_name = apply_filters('single_tag_title', $my_tag->name);
- if ( !empty($my_tag_name) ) {
- if ( $display )
- echo $prefix . $my_tag_name;
- else
- return $my_tag_name;
- }
- }
+ if ( empty( $term_name ) )
+ return;
+
+ if ( $display )
+ echo $prefix . $term_name;
+ else
+ return $term_name;
}
/**
@@ -701,8 +821,6 @@
* three values for the format are not used, then custom format is assumed.
*
* @since 1.0.0
- * @author Orien
- * @link http://icecode.com/ link navigation hack by Orien
*
* @param string $url URL to archive.
* @param string $text Archive text description.
@@ -725,7 +843,7 @@
else // custom
$link_html = "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
- $link_html = apply_filters( "get_archives_link", $link_html );
+ $link_html = apply_filters( 'get_archives_link', $link_html );
return $link_html;
}
@@ -797,8 +915,8 @@
}
//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 = '';
@@ -809,7 +927,7 @@
if ( !isset( $cache[ $key ] ) ) {
$arcresults = $wpdb->get_results($query);
$cache[ $key ] = $arcresults;
- wp_cache_add( 'wp_get_archives', $cache, 'general' );
+ wp_cache_set( 'wp_get_archives', $cache, 'general' );
} else {
$arcresults = $cache[ $key ];
}
@@ -831,7 +949,7 @@
if ( !isset( $cache[ $key ] ) ) {
$arcresults = $wpdb->get_results($query);
$cache[ $key ] = $arcresults;
- wp_cache_add( 'wp_get_archives', $cache, 'general' );
+ wp_cache_set( 'wp_get_archives', $cache, 'general' );
} else {
$arcresults = $cache[ $key ];
}
@@ -852,7 +970,7 @@
if ( !isset( $cache[ $key ] ) ) {
$arcresults = $wpdb->get_results($query);
$cache[ $key ] = $arcresults;
- wp_cache_add( 'wp_get_archives', $cache, 'general' );
+ wp_cache_set( 'wp_get_archives', $cache, 'general' );
} else {
$arcresults = $cache[ $key ];
}
@@ -868,14 +986,14 @@
}
}
} elseif ( 'weekly' == $type ) {
- $start_of_week = get_option('start_of_week');
- $query = "SELECT DISTINCT WEEK(post_date, $start_of_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(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC $limit";
+ $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_add( 'wp_get_archives', $cache, 'general' );
+ wp_cache_set( 'wp_get_archives', $cache, 'general' );
} else {
$arcresults = $cache[ $key ];
}
@@ -889,7 +1007,7 @@
$arc_week = get_weekstartend($arcresult->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', get_option('home'), '', '?', '=', $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, '&', '=', $arcresult->week);
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
if ($show_post_count)
$after = ' ('.$arcresult->posts.')'.$afterafter;
@@ -898,24 +1016,23 @@
}
}
} 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');
if ( !isset( $cache[ $key ] ) ) {
$arcresults = $wpdb->get_results($query);
$cache[ $key ] = $arcresults;
- wp_cache_add( 'wp_get_archives', $cache, 'general' );
+ wp_cache_set( 'wp_get_archives', $cache, 'general' );
} else {
$arcresults = $cache[ $key ];
}
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);
@@ -952,16 +1069,21 @@
* @since 1.0.0
*
* @param bool $initial Optional, default is true. Use initial calendar names.
+ * @param bool $echo Optional, default is true. Set to false for return.
*/
-function get_calendar($initial = true) {
+function get_calendar($initial = true, $echo = true) {
global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
$cache = array();
$key = md5( $m . $monthnum . $year );
if ( $cache = wp_cache_get( 'get_calendar', 'calendar' ) ) {
if ( is_array($cache) && isset( $cache[ $key ] ) ) {
- echo $cache[ $key ];
- return;
+ if ( $echo ) {
+ echo apply_filters( 'get_calendar', $cache[$key] );
+ return;
+ } else {
+ return apply_filters( 'get_calendar', $cache[$key] );
+ }
}
}
@@ -978,7 +1100,6 @@
}
}
- ob_start();
if ( isset($_GET['w']) )
$w = ''.intval($_GET['w']);
@@ -993,7 +1114,7 @@
// 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 )
@@ -1006,25 +1127,25 @@
}
$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');
- echo '<table id="wp-calendar" summary="' . esc_attr__('Calendar') . '">
+ $calendar_output = '<table id="wp-calendar">
<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
<thead>
<tr>';
@@ -1038,10 +1159,10 @@
foreach ( $myweek as $wd ) {
$day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
$wd = esc_attr($wd);
- echo "\n\t\t<th abbr=\"$wd\" scope=\"col\" title=\"$wd\">$day_name</th>";
+ $calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
}
- echo '
+ $calendar_output .= '
</tr>
</thead>
@@ -1049,24 +1170,20 @@
<tr>';
if ( $previous ) {
- echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($previous->month) . '" colspan="3" id="prev"><a href="' .
- get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month),
- date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
+ $calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link($previous->year, $previous->month) . '" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month), date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year)))) . '">« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
} else {
- echo "\n\t\t".'<td colspan="3" id="prev" class="pad"> </td>';
+ $calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad"> </td>';
}
- echo "\n\t\t".'<td class="pad"> </td>';
+ $calendar_output .= "\n\t\t".'<td class="pad"> </td>';
if ( $next ) {
- echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($next->month) . '" colspan="3" id="next"><a href="' .
- get_month_link($next->year, $next->month) . '" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month) ,
- date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) ) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' »</a></td>';
+ $calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link($next->year, $next->month) . '" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month), date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) ) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' »</a></td>';
} else {
- echo "\n\t\t".'<td colspan="3" id="next" class="pad"> </td>';
+ $calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad"> </td>';
}
- echo '
+ $calendar_output .= '
</tr>
</tfoot>
@@ -1075,10 +1192,9 @@
// 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];
@@ -1087,23 +1203,22 @@
$daywithpost = array();
}
- if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false)
+ if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'camino') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false)
$ak_title_separator = "\n";
else
$ak_title_separator = ', ';
$ak_titles_for_day = array();
- $ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
+ $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 ) {
foreach ( (array) $ak_post_titles as $ak_post_title ) {
- $post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title ) );
+ $post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title, $ak_post_title->ID ) );
if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
@@ -1114,28 +1229,27 @@
}
}
-
// See how much we should pad in the beginning
$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
if ( 0 != $pad )
- echo "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad"> </td>';
+ $calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad"> </td>';
$daysinmonth = intval(date('t', $unixmonth));
for ( $day = 1; $day <= $daysinmonth; ++$day ) {
if ( isset($newrow) && $newrow )
- echo "\n\t</tr>\n\t<tr>\n\t\t";
+ $calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
$newrow = false;
- if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) )
- echo '<td id="today">';
+ if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
+ $calendar_output .= '<td id="today">';
else
- echo '<td>';
+ $calendar_output .= '<td>';
if ( in_array($day, $daywithpost) ) // any posts today?
- echo '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"" . esc_attr($ak_titles_for_day[$day]) . "\">$day</a>";
+ $calendar_output .= '<a href="' . get_day_link( $thisyear, $thismonth, $day ) . '" title="' . esc_attr( $ak_titles_for_day[ $day ] ) . "\">$day</a>";
else
- echo $day;
- echo '</td>';
+ $calendar_output .= $day;
+ $calendar_output .= '</td>';
if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
$newrow = true;
@@ -1143,15 +1257,18 @@
$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
if ( $pad != 0 && $pad != 7 )
- echo "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'"> </td>';
+ $calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'"> </td>';
- echo "\n\t</tr>\n\t</tbody>\n\t</table>";
+ $calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
- $output = ob_get_contents();
- ob_end_clean();
- echo $output;
- $cache[ $key ] = $output;
+ $cache[ $key ] = $calendar_output;
wp_cache_set( 'get_calendar', $cache, 'calendar' );
+
+ if ( $echo )
+ echo apply_filters( 'get_calendar', $calendar_output );
+ else
+ return apply_filters( 'get_calendar', $calendar_output );
+
}
/**
@@ -1207,12 +1324,72 @@
}
/**
- * Display or Retrieve the date the post was written.
+ * Display or Retrieve the date the current $post was written (once per date)
*
* 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.
+ *
+ * HTML output can be filtered with 'the_date'.
+ * Date string output can be filtered with 'get_the_date'.
+ *
* @since 0.71
+ * @uses get_the_date()
+ * @param string $d Optional. PHP date format defaults to the date_format option if not specified.
+ * @param string $before Optional. Output before the date.
+ * @param string $after Optional. Output after the date.
+ * @param bool $echo Optional, default is display. Whether to echo the date or return it.
+ * @return string|null Null if displaying, string if retrieving.
+ */
+function the_date( $d = '', $before = '', $after = '', $echo = true ) {
+ global $currentday, $previousday;
+ $the_date = '';
+ if ( $currentday != $previousday ) {
+ $the_date .= $before;
+ $the_date .= get_the_date( $d );
+ $the_date .= $after;
+ $previousday = $currentday;
+
+ $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
+
+ if ( $echo )
+ echo $the_date;
+ else
+ return $the_date;
+ }
+
+ return null;
+}
+
+/**
+ * Retrieve the date the current $post was written.
+ *
+ * Unlike the_date() this function will always return the date.
+ * Modify output with 'get_the_date' filter.
+ *
+ * @since 3.0.0
+ *
+ * @param string $d Optional. PHP date format defaults to the date_format option if not specified.
+ * @return string|null Null if displaying, string if retrieving.
+ */
+function get_the_date( $d = '' ) {
+ global $post;
+ $the_date = '';
+
+ if ( '' == $d )
+ $the_date .= mysql2date(get_option('date_format'), $post->post_date);
+ else
+ $the_date .= mysql2date($d, $post->post_date);
+
+ return apply_filters('get_the_date', $the_date, $d);
+}
+
+/**
+ * Display the date on which the post was last modified.
+ *
+ * @since 2.1.0
*
* @param string $d Optional. PHP date format defaults to the date_format option if not specified.
* @param string $before Optional. Output before the date.
@@ -1220,36 +1397,16 @@
* @param bool $echo Optional, default is display. Whether to echo the date or return it.
* @return string|null Null if displaying, string if retrieving.
*/
-function the_date($d='', $before='', $after='', $echo = true) {
- global $post, $day, $previousday;
- $the_date = '';
- if ( $day != $previousday ) {
- $the_date .= $before;
- if ( $d=='' )
- $the_date .= mysql2date(get_option('date_format'), $post->post_date);
- else
- $the_date .= mysql2date($d, $post->post_date);
- $the_date .= $after;
- $previousday = $day;
+function the_modified_date($d = '', $before='', $after='', $echo = true) {
- $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
+ $the_modified_date = $before . get_the_modified_date($d) . $after;
+ $the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
+
if ( $echo )
- echo $the_date;
+ echo $the_modified_date;
else
- return $the_date;
- }
-}
+ return $the_modified_date;
-/**
- * Display the date on which the post was last modified.
- *
- * @since 2.1.0
- *
- * @param string $d Optional. PHP date format.
- * @return string
- */
-function the_modified_date($d = '') {
- echo apply_filters('the_modified_date', get_the_modified_date($d), $d);
}
/**
@@ -1284,7 +1441,7 @@
*
* @since 1.5.0
*
- * @param string $d Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
+ * @param string $d Optional Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
* @param int|object $post Optional post ID or object. Default is global $post object.
* @return string
*/
@@ -1303,10 +1460,10 @@
*
* @since 2.0.0
*
- * @param string $d Either 'G', 'U', or php date format.
- * @param bool $gmt Whether of not to return the gmt time.
+ * @param string $d Optional Either 'G', 'U', or php date format.
+ * @param bool $gmt Optional, default is false. Whether to return the gmt time.
* @param int|object $post Optional post ID or object. Default is global $post object.
- * @param bool $translate Whether to translate the time string or not
+ * @param bool $translate Whether to translate the time string
* @return string
*/
function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) { // returns timestamp
@@ -1326,7 +1483,7 @@
*
* @since 2.0.0
*
- * @param string $d Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
+ * @param string $d Optional Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
*/
function the_modified_time($d = '') {
echo apply_filters('the_modified_time', get_the_modified_time($d), $d);
@@ -1337,7 +1494,7 @@
*
* @since 2.0.0
*
- * @param string $d Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
+ * @param string $d Optional Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
* @return string
*/
function get_the_modified_time($d = '') {
@@ -1353,10 +1510,10 @@
*
* @since 2.0.0
*
- * @param string $d Either 'G', 'U', or php date format.
- * @param bool $gmt Whether of not to return the gmt time.
- * @param int|object $post A post_id or post object
- * @param bool translate Whether to translate the result or not
+ * @param string $d Optional, default is 'U'. Either 'G', 'U', or php date format.
+ * @param bool $gmt Optional, default is false. Whether to return the gmt time.
+ * @param int|object $post Optional, default is global post object. A post_id or post object
+ * @param bool $translate Optional, default is false. Whether to translate the result
* @return string Returns timestamp
*/
function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
@@ -1393,17 +1550,17 @@
*
* @since 0.71
*
- * @param string $before output before the date.
- * @param string $after output after the date.
- */
+ * @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;
@@ -1430,29 +1587,16 @@
}
/**
- * Enable/disable automatic general feed link outputting.
- *
- * @since 2.8.0
- *
- * @param boolean $add Add or remove links. Defaults to true.
- */
-function automatic_feed_links( $add = true ) {
- if ( $add )
- add_action( 'wp_head', 'feed_links', 2 );
- else {
- remove_action( 'wp_head', 'feed_links', 2 );
- remove_action( 'wp_head', 'feed_links_extra', 3 );
- }
-}
-
-/**
* Display the links to the general feeds.
*
* @since 2.8.0
*
* @param array $args Optional arguments.
*/
-function feed_links( $args ) {
+function feed_links( $args = array() ) {
+ if ( !current_theme_supports('automatic-feed-links') )
+ return;
+
$defaults = array(
/* translators: Separator between blog name and feed type in feed links */
'separator' => _x('»', 'feed link'),
@@ -1475,7 +1619,7 @@
*
* @param array $args Optional arguments.
*/
-function feed_links_extra( $args ) {
+function feed_links_extra( $args = array() ) {
$defaults = array(
/* translators: Separator between blog name and feed type in feed links */
'separator' => _x('»', 'feed link'),
@@ -1494,35 +1638,35 @@
$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() ));
+ $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
$href = get_search_feed_link();
}
if ( isset($title) && isset($href) )
- echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . $title . '" href="' . $href . '" />' . "\n";
+ echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
}
/**
@@ -1550,14 +1694,29 @@
* 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 "<meta name='robots' content='noindex,nofollow' />\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 "<meta name='robots' content='noindex,nofollow' />\n";
}
/**
@@ -1567,7 +1726,7 @@
*
* @since 2.1.0
*
- * @return bool Whether of not TinyMCE exists.
+ * @return bool Whether TinyMCE exists.
*/
function rich_edit_exists() {
global $wp_rich_edit_exists;
@@ -1577,7 +1736,7 @@
}
/**
- * Whether or not the user should have a WYSIWIG editor.
+ * Whether the user should have a WYSIWIG editor.
*
* Checks that the user requires a WYSIWIG editor and that the editor is
* supported in the users browser.
@@ -1587,16 +1746,17 @@
* @return bool
*/
function user_can_richedit() {
- global $wp_rich_edit, $pagenow;
+ global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE;
+
+ if ( !isset($wp_rich_edit) ) {
+ $wp_rich_edit = false;
- 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;
+ 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 ) {
+ $wp_rich_edit = true;
+ }
}
}
@@ -1623,89 +1783,49 @@
}
/**
- * Display visual editor forms: TinyMCE, or HTML, or both.
+ * Renders an editor.
+ *
+ * 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.
*
- * 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'.
- *
- * If the user can not use the rich editor (TinyMCE), then the switch button
- * will not be displayed.
- *
- * @since 2.1.0
+ * 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.
*
- * @param string $content Textarea content.
- * @param string $id HTML ID attribute value.
- * @param string $prev_id 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.
+ * @see wp-includes/class-wp-editor.php
+ * @since 3.3.0
+ *
+ * @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 ) { ?>
- <div id="editor-toolbar">
-<?php
- if ( $richedit ) {
- $wp_default_editor = wp_default_editor(); ?>
- <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
-<?php if ( 'html' == $wp_default_editor ) {
- add_filter('the_editor_content', 'wp_htmledit_pre'); ?>
- <a id="edButtonHTML" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
- <a id="edButtonPreview" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
-<?php } else {
- $class = " class='theEditor'";
- add_filter('the_editor_content', 'wp_richedit_pre'); ?>
- <a id="edButtonHTML" class="hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
- <a id="edButtonPreview" class="active hide-if-no-js" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
-<?php }
- }
-
- if ( $media_buttons ) { ?>
- <div id="media-buttons" class="hide-if-no-js">
-<?php do_action( 'media_buttons' ); ?>
- </div>
-<?php
- } ?>
- </div>
-<?php
- }
-?>
- <div id="quicktags"><?php
- wp_print_scripts( 'quicktags' ); ?>
- <script type="text/javascript">edToolbar()</script>
- </div>
-
-<?php
- $the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
- $the_editor_content = apply_filters('the_editor_content', $content);
-
- printf($the_editor, $the_editor_content);
-
-?>
- <script type="text/javascript">
- edCanvas = document.getElementById('<?php echo $id; ?>');
- </script>
-<?php
+ _WP_Editors::editor($content, $editor_id, $settings);
}
/**
* Retrieve the contents of the search WordPress query variable.
*
+ * The search query string is passed through {@link esc_attr()}
+ * to ensure that it is safe for placing in an html attribute.
+ *
* @since 2.3.0
+ * @uses esc_attr()
*
+ * @param bool $escaped Whether the result is escaped. Default true.
+ * Only use when you are later escaping it. Do not use unescaped.
* @return string
*/
-function get_search_query() {
- return apply_filters( 'get_search_query', get_query_var( 's' ) );
+function get_search_query( $escaped = true ) {
+ $query = apply_filters( 'get_search_query', get_query_var( 's' ) );
+ if ( $escaped )
+ $query = esc_attr( $query );
+ return $query;
}
/**
@@ -1714,11 +1834,11 @@
* The search query string is passed through {@link esc_attr()}
* to ensure that it is safe for placing in an html attribute.
*
- * @uses attr
+ * @uses esc_attr()
* @since 2.1.0
*/
function the_search_query() {
- echo esc_attr( apply_filters( 'the_search_query', get_search_query() ) );
+ echo esc_attr( apply_filters( 'the_search_query', get_search_query( false ) ) );
}
/**
@@ -1735,8 +1855,8 @@
$attributes = array();
$output = '';
- if ( $dir = get_bloginfo('text_direction') )
- $attributes[] = "dir=\"$dir\"";
+ if ( function_exists( 'is_rtl' ) )
+ $attributes[] = 'dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"';
if ( $lang = get_bloginfo('language') ) {
if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
@@ -1835,7 +1955,7 @@
if ( $add_args )
$link = add_query_arg( $add_args, $link );
$link .= $add_fragment;
- $page_links[] = "<a class='prev page-numbers' href='" . esc_url($link) . "'>$prev_text</a>";
+ $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $prev_text . '</a>';
endif;
for ( $n = 1; $n <= $total; $n++ ) :
$n_display = number_format_i18n($n);
@@ -1849,10 +1969,10 @@
if ( $add_args )
$link = add_query_arg( $add_args, $link );
$link .= $add_fragment;
- $page_links[] = "<a class='page-numbers' href='" . esc_url($link) . "'>$n_display</a>";
+ $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>$n_display</a>";
$dots = true;
elseif ( $dots && !$show_all ) :
- $page_links[] = "<span class='page-numbers dots'>...</span>";
+ $page_links[] = '<span class="page-numbers dots">' . __( '…' ) . '</span>';
$dots = false;
endif;
endif;
@@ -1863,7 +1983,7 @@
if ( $add_args )
$link = add_query_arg( $add_args, $link );
$link .= $add_fragment;
- $page_links[] = "<a class='next page-numbers' href='" . esc_url($link) . "'>$next_text</a>";
+ $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $next_text . '</a>';
endif;
switch ( $type ) :
case 'array' :
@@ -1895,7 +2015,7 @@
* @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 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;
@@ -1907,6 +2027,18 @@
}
/**
+ * Registers the default Admin color schemes
+ *
+ * @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' ),
+ array( '#5589aa', '#cfdfe9', '#d1e5ee', '#eff8ff' ) );
+ wp_admin_css_color( 'fresh', _x( 'Gray', 'admin color scheme' ), admin_url( 'css/colors-fresh.css' ),
+ array( '#555', '#a0a0a0', '#ccc', '#f1f1f1' ) );
+}
+
+/**
* Display the URL of a WordPress admin CSS file.
*
* @see WP_Styles::_css_href and its style_loader_src filter.
@@ -1932,7 +2064,7 @@
* "Intelligently" decides to enqueue or to print the CSS file. If the
* 'wp_print_styles' action has *not* yet been called, the CSS file will be
* enqueued. If the wp_print_styles action *has* been called, the CSS link will
- * be printed. Printing may be forced by passing TRUE as the $force_echo
+ * be printed. Printing may be forced by passing true as the $force_echo
* (second) parameter.
*
* For backward compatibility with WordPress 2.3 calling method: If the $file
@@ -1944,8 +2076,9 @@
* @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 bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
+ * @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 ) {
global $wp_styles;
@@ -1956,7 +2089,7 @@
$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
if ( $wp_styles->query( $handle ) ) {
- if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
+ if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
wp_print_styles( $handle );
else // Add to style queue
wp_enqueue_style( $handle );
@@ -1964,7 +2097,7 @@
}
echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
- if ( 'rtl' == get_bloginfo( 'text_direction' ) )
+ if ( function_exists( 'is_rtl' ) && is_rtl() )
echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
}
@@ -1972,7 +2105,7 @@
* Enqueues the default ThickBox js and css.
*
* If any of the settings need to be changed, this can be done with another js
- * file similar to media-upload.js and theme-preview.js. That file should
+ * file similar to media-upload.js. That file should
* require array('thickbox') to ensure it is loaded after.
*
* @since 2.5.0
@@ -1980,6 +2113,9 @@
function add_thickbox() {
wp_enqueue_script( 'thickbox' );
wp_enqueue_style( 'thickbox' );
+
+ if ( is_network_admin() )
+ add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
}
/**
@@ -2019,8 +2155,34 @@
* @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
* @return string The HTML content for the generator.
*/
-function get_the_generator( $type ) {
- switch ($type) {
+function get_the_generator( $type = '' ) {
+ if ( empty( $type ) ) {
+
+ $current_filter = current_filter();
+ if ( empty( $current_filter ) )
+ return;
+
+ switch ( $current_filter ) {
+ case 'rss2_head' :
+ case 'commentsrss2_head' :
+ $type = 'rss2';
+ break;
+ case 'rss_head' :
+ case 'opml_head' :
+ $type = 'comment';
+ break;
+ case 'rdf_header' :
+ $type = 'rdf';
+ break;
+ case 'atom_head' :
+ case 'comments_atom_head' :
+ case 'app_head' :
+ $type = 'atom';
+ break;
+ }
+ }
+
+ switch ( $type ) {
case 'html':
$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
break;
@@ -2040,10 +2202,82 @@
$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
break;
case 'export':
- $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '"-->';
+ $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
break;
}
return apply_filters( "get_the_generator_{$type}", $gen, $type );
}
-?>
\ No newline at end of file
+/**
+ * Outputs the html checked attribute.
+ *
+ * Compares the first two arguments and if identical marks as checked
+ *
+ * @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
+ * @param bool $echo Whether to echo or just return the string
+ * @return string html attribute or empty string
+ */
+function checked( $checked, $current = true, $echo = true ) {
+ return __checked_selected_helper( $checked, $current, $echo, 'checked' );
+}
+
+/**
+ * Outputs the html selected attribute.
+ *
+ * Compares the first two arguments and if identical marks as selected
+ *
+ * @since 1.0.0
+ *
+ * @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
+ */
+function selected( $selected, $current = true, $echo = true ) {
+ return __checked_selected_helper( $selected, $current, $echo, 'selected' );
+}
+
+/**
+ * Outputs the html disabled attribute.
+ *
+ * Compares the first two arguments and if identical marks as disabled
+ *
+ * @since 3.0.0
+ *
+ * @param mixed $disabled 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
+ */
+function disabled( $disabled, $current = true, $echo = true ) {
+ return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
+}
+
+/**
+ * Private helper function for checked, selected, and disabled.
+ *
+ * Compares the first two arguments and if identical marks as $type
+ *
+ * @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 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
+ */
+function __checked_selected_helper( $helper, $current, $echo, $type ) {
+ if ( (string) $helper === (string) $current )
+ $result = " $type='$type'";
+ else
+ $result = '';
+
+ if ( $echo )
+ echo $result;
+
+ return $result;
+}