* 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".
$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( 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".
$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( 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".
$templates[] = "sidebar.php";
+ // Backward compat code will be removed in a future release
if ('' == locate_template($templates, true))
- load_template( get_theme_root() . '/default/sidebar.php');
+ load_template( WPINC . '/theme-compat/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 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);
}
/**
* 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'));
return;
}
- $form = '<form role="search" method="get" id="searchform" action="' . get_option('home') . '/" >
+ $form = '<form role="search" method="get" id="searchform" action="' . 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);
}
/**
* @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' => site_url( $_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="' . site_url( 'wp-login.php', 'login' ) . '" method="post">
+ ' . apply_filters( 'login_form_top', '' ) . '
+ <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['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_attr( $args['redirect'] ) . '" />
+ </p>
+ ' . apply_filters( 'login_form_bottom', '' ) . '
+ </form>';
+
+ if ( $args['echo'] )
+ echo $form;
+ else
+ return $form;
+}
+
/**
* Returns the Lost Password URL.
*
*
* @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') )
$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);
}
/**
*
* @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>
* 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');
$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:
$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) ) {
$title = $year;
if ( !empty($monthnum) )
- $title .= "$t_sep" . $wp_locale->get_month($monthnum);
+ $title .= $t_sep . $wp_locale->get_month($monthnum);
if ( !empty($day) )
- $title .= "$t_sep" . zeroise($day, 2);
+ $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 ) );
+ $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 );
- $tax = $tax->label;
$term = $wp_query->get_queried_object();
$term = $term->name;
- $title = "$tax$t_sep$term";
+ $title = $tax->labels->name . $t_sep . $term;
}
//If it's a search
* @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');
-
- 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);
- }
+ global $wp_query, $post;
+
+ if ( ! $post )
+ $_post = $wp_query->get_queried_object();
+ else
+ $_post = $post;
+
+ if ( !isset($_post->post_title) )
+ return;
+
+ $title = apply_filters('single_post_title', $_post->post_title, $_post);
+ if ( $display )
+ echo $prefix . $title;
+ else
+ return $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() ) {
+ 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;
}
}
* @return string|null Title when retrieving, null when displaying or failure.
*/
function single_tag_title($prefix = '', $display = true ) {
+ global $wp_query;
if ( !is_tag() )
return;
- $tag_id = intval( get_query_var('tag_id') );
-
- 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;
- }
+ $tag = $wp_query->get_queried_object();
+
+ if ( ! $tag )
+ 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;
}
}
* 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.
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 ( !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 ( !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 ];
}
}
}
} 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 ];
}
$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;
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 ];
}
* @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] );
+ }
}
}
}
}
- ob_start();
if ( isset($_GET['w']) )
$w = ''.intval($_GET['w']);
/* 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" summary="' . esc_attr__('Calendar') . '">
<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
<thead>
<tr>';
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>
<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="' . 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>
$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' "
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] = '';
// 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;
$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 );
+
}
/**
}
/**
- * 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.
*
- * @since 0.71
+ * 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 $post, $day, $previousday;
+function the_date( $d = '', $before = '', $after = '', $echo = true ) {
+ global $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 .= get_the_date( $d );
$the_date .= $after;
$previousday = $day;
- $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
- if ( $echo )
- echo $the_date;
- else
- return $the_date;
+ $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);
}
/**
*
* @since 2.1.0
*
- * @param string $d Optional. PHP date format.
- * @return string
+ * @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_modified_date($d = '') {
- echo apply_filters('the_modified_date', get_the_modified_date($d), $d);
+function the_modified_date($d = '', $before='', $after='', $echo = true) {
+
+ $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_modified_date;
+ else
+ return $the_modified_date;
+
}
/**
*
* @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
*/
*
* @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
*
* @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);
*
* @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 = '') {
*
* @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 ) {
*
* @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;
do_action('wp_footer');
}
-/**
- * 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.
*
*
* @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'),
*
* @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'),
$title = esc_attr(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 = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) ));
$href = get_search_feed_link();
}
*
* @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;
}
/**
- * 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.
* @since 2.1.0
*
* @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 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.
*/
/**
* 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;
}
/**
* 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 ) ) );
}
/**
$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' )
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);
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>";
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' :
* @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;
$_wp_admin_css_colors[$key] = (object) array('name' => $name, 'url' => $url, 'colors' => $colors);
}
+/**
+ * Registers the default Admin color schemes
+ *
+ * @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'));}
+
/**
* Display the URL of a WordPress admin CSS file.
*
}
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 ( 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" );
}
* @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;
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
+ *
+ * @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
+ *
+ * @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
+ * @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;
+}
+
+?>
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff