* @param string $name The name of the specialised header.
*/
function get_header( $name = null ) {
- do_action( 'get_header' );
+ do_action( 'get_header', $name );
$templates = array();
if ( isset($name) )
* @param string $name The name of the specialised footer.
*/
function get_footer( $name = null ) {
- do_action( 'get_footer' );
+ do_action( 'get_footer', $name );
$templates = array();
if ( isset($name) )
* @param string $name The name of the specialised sidebar.
*/
function get_sidebar( $name = null ) {
- do_action( 'get_sidebar' );
+ do_action( 'get_sidebar', $name );
$templates = array();
if ( isset($name) )
*
* Will first attempt to locate the searchform.php file in either the child or
* the parent, then load it. If it doesn't exist, then the default search form
- * will be displayed.
+ * will be displayed. The default search form is HTML, which will be displayed.
+ * There is a filter applied to the search form HTML in order to edit or replace
+ * it. The filter is 'get_search_form'.
+ *
+ * This function is primarily used by themes which want to hardcode the search
+ * form into the sidebar and also by the search widget in WordPress.
+ *
+ * There is also an action that is called whenever the function is run called,
+ * 'get_search_form'. This can be useful for outputting JavaScript that the
+ * search relies on or various formatting that applies to the beginning of the
+ * search. To give a few examples of what it can be used for.
*
* @since 2.7.0
*/
function get_search_form() {
do_action( 'get_search_form' );
- if ( '' != locate_template(array('searchform.php'), true) )
+ $search_form_template = locate_template(array('searchform.php'));
+ if ( '' != $search_form_template ) {
+ require($search_form_template);
return;
+ }
- $form = '<form method="get" id="searchform" action="' . get_option('home') . '/" >
- <label class="hidden" for="s">' . __('Search for:') . '</label>
- <div><input type="text" value="' . attribute_escape(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
- <input type="submit" id="searchsubmit" value="'.attribute_escape(__('Search')).'" />
+ $form = '<form role="search" method="get" id="searchform" action="' . get_option('home') . '/" >
+ <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="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</div>
</form>';
*
* @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.
*/
-function wp_loginout() {
+function wp_loginout($redirect = '') {
if ( ! is_user_logged_in() )
- $link = '<a href="' . wp_login_url() . '">' . __('Log in') . '</a>';
+ $link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
else
- $link = '<a href="' . wp_logout_url() . '">' . __('Log out') . '</a>';
+ $link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
echo apply_filters('loginout', $link);
}
* @since 2.7
* @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
*
* @param string $redirect Path to redirect to on logout.
*/
function wp_logout_url($redirect = '') {
- if ( strlen($redirect) )
- $redirect = "&redirect_to=$redirect";
+ $args = array( 'action' => 'logout' );
+ if ( !empty($redirect) ) {
+ $args['redirect_to'] = $redirect;
+ }
- return wp_nonce_url( site_url("wp-login.php?action=logout$redirect", 'login'), 'log-out' );
+ $logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
+ $logout_url = wp_nonce_url( $logout_url, 'log-out' );
+
+ return apply_filters('logout_url', $logout_url, $redirect);
}
/**
*
* @since 2.7
* @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.
*/
function wp_login_url($redirect = '') {
- if ( strlen($redirect) )
- $redirect = "?redirect_to=$redirect";
+ $login_url = site_url('wp-login.php', 'login');
+
+ if ( !empty($redirect) ) {
+ $login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+ }
- return site_url("wp-login.php$redirect", 'login');
+ return apply_filters('login_url', $login_url, $redirect);
+}
+
+/**
+ * Returns the Lost Password URL.
+ *
+ * Returns the URL that allows the user to retrieve the lost password
+ *
+ * @since 2.8.0
+ * @uses site_url() To generate the lost password URL
+ * @uses apply_filters() calls 'lostpassword_url' hook on the lostpassword url
+ *
+ * @param string $redirect Path to redirect to on login.
+ */
+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);
}
/**
$year = get_query_var('year');
$monthnum = get_query_var('monthnum');
$day = get_query_var('day');
+ $search = get_query_var('s');
$title = '';
$t_sep = '%WP_TITILE_SEP%'; // Temporary separator, for accurate flipping, if necessary
}
// If there is a post
- if ( is_single() || ( is_page() && !is_front_page() ) ) {
+ 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 = "$tax$t_sep$term";
}
+ //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 ( is_404() ) {
$title = __('Page not found');
}
*/
function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
$text = wptexturize($text);
- $title_text = attribute_escape($text);
- $url = clean_url($url);
+ $title_text = esc_attr($text);
+ $url = esc_url($url);
if ('link' == $format)
$link_html = "\t<link rel='archives' title='$title_text' href='$url' />\n";
$output = '';
if ( 'monthly' == $type ) {
- $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
+ $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC $limit";
$key = md5($query);
$cache = wp_cache_get( 'wp_get_archives' , 'general');
if ( !isset( $cache[ $key ] ) ) {
}
}
} elseif ('yearly' == $type) {
- $query = "SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
+ $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC $limit";
$key = md5($query);
$cache = wp_cache_get( 'wp_get_archives' , 'general');
if ( !isset( $cache[ $key ] ) ) {
}
}
} elseif ( 'daily' == $type ) {
- $query = "SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
+ $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC $limit";
$key = md5($query);
$cache = wp_cache_get( 'wp_get_archives' , 'general');
if ( !isset( $cache[ $key ] ) ) {
function get_calendar($initial = 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 ( isset( $cache[ $key ] ) ) {
+ if ( is_array($cache) && isset( $cache[ $key ] ) ) {
echo $cache[ $key ];
return;
}
}
- ob_start();
+ if ( !is_array($cache) )
+ $cache = array();
+
// Quick check. If we have no posts at all, abort!
if ( !$posts ) {
- $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
- if ( !$gotsome )
+ $gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
+ if ( !$gotsome ) {
+ $cache[ $key ] = '';
+ wp_cache_set( 'get_calendar', $cache, 'calendar' );
return;
+ }
}
+ ob_start();
if ( isset($_GET['w']) )
$w = ''.intval($_GET['w']);
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="' . __('Calendar') . '">
- <caption>' . sprintf(_c('%1$s %2$s|Used as a calendar caption'), $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
+ <caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
<thead>
<tr>';
if ( $ak_post_titles ) {
foreach ( (array) $ak_post_titles as $ak_post_title ) {
- $post_title = apply_filters( "the_title", $ak_post_title->post_title );
- $post_title = str_replace('"', '"', wptexturize( $post_title ));
+ $post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title ) );
if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
*/
function the_date_xml() {
global $post;
- echo mysql2date('Y-m-d', $post->post_date);
+ echo mysql2date('Y-m-d', $post->post_date, false);
}
/**
$the_date .= mysql2date($d, $post->post_date);
$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;
+ }
}
/**
*/
function get_the_modified_date($d = '') {
if ( '' == $d )
- $the_time = get_post_modified_time(get_option('date_format'));
+ $the_time = get_post_modified_time(get_option('date_format'), null, null, true);
else
- $the_time = get_post_modified_time($d);
+ $the_time = get_post_modified_time($d, null, null, true);
return apply_filters('get_the_modified_date', $the_time, $d);
}
$post = get_post($post);
if ( '' == $d )
- $the_time = get_post_time(get_option('time_format'), false, $post);
+ $the_time = get_post_time(get_option('time_format'), false, $post, true);
else
- $the_time = get_post_time($d, false, $post);
+ $the_time = get_post_time($d, false, $post, true);
return apply_filters('get_the_time', $the_time, $d, $post);
}
* @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 Optional post ID or object. Default is global $post object.
+ * @param bool $translate Whether to translate the time string or not
* @return string
*/
-function get_post_time( $d = 'U', $gmt = false, $post = null ) { // returns timestamp
+function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) { // returns timestamp
$post = get_post($post);
if ( $gmt )
else
$time = $post->post_date;
- $time = mysql2date($d, $time);
+ $time = mysql2date($d, $time, $translate);
return apply_filters('get_post_time', $time, $d, $gmt);
}
*/
function get_the_modified_time($d = '') {
if ( '' == $d )
- $the_time = get_post_modified_time(get_option('time_format'));
+ $the_time = get_post_modified_time(get_option('time_format'), null, null, true);
else
- $the_time = get_post_modified_time($d);
+ $the_time = get_post_modified_time($d, null, null, true);
return apply_filters('get_the_modified_time', $the_time, $d);
}
*
* @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
* @return string Returns timestamp
*/
-function get_post_modified_time( $d = 'U', $gmt = false ) {
- global $post;
+function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+ $post = get_post($post);
if ( $gmt )
$time = $post->post_modified_gmt;
else
$time = $post->post_modified;
- $time = mysql2date($d, $time);
+ $time = mysql2date($d, $time, $translate);
- return apply_filters('get_the_modified_time', $time, $d, $gmt);
+ return apply_filters('get_post_modified_time', $time, $d, $gmt);
}
/**
*/
function the_weekday() {
global $wp_locale, $post;
- $the_weekday = $wp_locale->get_weekday(mysql2date('w', $post->post_date));
+ $the_weekday = $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
$the_weekday = apply_filters('the_weekday', $the_weekday);
echo $the_weekday;
}
$the_weekday_date = '';
if ( $day != $previousweekday ) {
$the_weekday_date .= $before;
- $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date));
+ $the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', $post->post_date, false));
$the_weekday_date .= $after;
$previousweekday = $day;
}
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.
+ *
+ * @since 2.8.0
+ *
+ * @param array $args Optional arguments.
+ */
+function feed_links( $args ) {
+ $defaults = array(
+ /* translators: Separator between blog name and feed type in feed links */
+ 'separator' => _x('»', 'feed link'),
+ /* translators: 1: blog title, 2: separator (raquo) */
+ 'feedtitle' => __('%1$s %2$s Feed'),
+ /* translators: %s: blog title, 2: separator (raquo) */
+ 'comstitle' => __('%1$s %2$s Comments Feed'),
+ );
+
+ $args = wp_parse_args( $args, $defaults );
+
+ echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['feedtitle'], get_bloginfo('name'), $args['separator'] )) . '" href="' . get_feed_link() . "\" />\n";
+ echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['comstitle'], get_bloginfo('name'), $args['separator'] )) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
+}
+
+/**
+ * Display the links to the extra feeds such as category feeds.
+ *
+ * @since 2.8.0
+ *
+ * @param array $args Optional arguments.
+ */
+function feed_links_extra( $args ) {
+ $defaults = array(
+ /* translators: Separator between blog name and feed type in feed links */
+ 'separator' => _x('»', 'feed link'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: post title */
+ 'singletitle' => __('%1$s %2$s %3$s Comments Feed'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: category name */
+ 'cattitle' => __('%1$s %2$s %3$s Category Feed'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: tag name */
+ 'tagtitle' => __('%1$s %2$s %3$s Tag Feed'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: author name */
+ 'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
+ /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
+ 'searchtitle' => __('%1$s %2$s Search Results for “%3$s” Feed'),
+ );
+
+ $args = wp_parse_args( $args, $defaults );
+
+ if ( is_single() || is_page() ) {
+ $post = &get_post( $id = 0 );
+
+ 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() ) ));
+ $href = get_post_comments_feed_link( $post->ID );
+ }
+ } elseif ( is_category() ) {
+ $cat_id = intval( get_query_var('cat') );
+
+ $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
+ $href = get_category_feed_link( $cat_id );
+ } elseif ( is_tag() ) {
+ $tag_id = intval( get_query_var('tag_id') );
+ $tag = get_tag( $tag_id );
+
+ $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
+ $href = get_tag_feed_link( $tag_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 ) ));
+ $href = get_author_feed_link( $author_id );
+ } elseif ( is_search() ) {
+ $title = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query() ));
+ $href = get_search_feed_link();
+ }
+
+ if ( isset($title) && isset($href) )
+ echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . $title . '" href="' . $href . '" />' . "\n";
+}
+
/**
* Display the link to the Really Simple Discovery service endpoint.
*
$media_buttons = false;
$richedit = user_can_richedit();
- $rows = "rows='$rows'";
+ $class = '';
if ( $richedit || $media_buttons ) { ?>
<div id="editor-toolbar">
- <?php if ( $richedit ) {
+<?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 ) {
+<?php if ( 'html' == $wp_default_editor ) {
add_filter('the_editor_content', 'wp_htmledit_pre'); ?>
- <a id="edButtonHTML" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
- <a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
- <?php } else {
+ <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" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
- <a id="edButtonPreview" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
- <?php }
- }
+ <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 } ?>
+ 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' ); ?>
+<?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 cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
+<?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">
- // < {
- if (e.which == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
- if ( (jQuery("#post_ID").val() < 1) && (jQuery("#title").val().length > 0) ) { autosave(); }
- if ( tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden() && dotabkey ) {
- e.preventDefault();
- dotabkey = false;
- tinyMCE.activeEditor.focus();
- return false;
- }
- }
- });
- }
- <?php } ?>
- // ]]>
</script>
- <?php
+<?php
}
/**
/**
* Display the contents of the search query variable.
*
- * The search query string is passed through {@link attribute_escape()}
+ * The search query string is passed through {@link esc_attr()}
* to ensure that it is safe for placing in an html attribute.
*
- * @uses attribute_escape
+ * @uses attr
* @since 2.1.0
*/
function the_search_query() {
- echo attribute_escape( apply_filters( 'the_search_query', get_search_query() ) );
+ echo esc_attr( apply_filters( 'the_search_query', get_search_query() ) );
}
/**
if ( $add_args )
$link = add_query_arg( $add_args, $link );
$link .= $add_fragment;
- $page_links[] = "<a class='prev page-numbers' href='" . clean_url($link) . "'>$prev_text</a>";
+ $page_links[] = "<a class='prev page-numbers' href='" . esc_url($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='" . clean_url($link) . "'>$n_display</a>";
+ $page_links[] = "<a class='page-numbers' href='" . esc_url($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='" . clean_url($link) . "'>$next_text</a>";
+ $page_links[] = "<a class='next page-numbers' href='" . esc_url($link) . "'>$next_text</a>";
endif;
switch ( $type ) :
case 'array' :
return;
}
- echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $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' ) )
- echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-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" );
}
/**
function get_the_generator( $type ) {
switch ($type) {
case 'html':
- $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">' . "\n";
+ $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
break;
case 'xhtml':
- $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />' . "\n";
+ $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
break;
case 'atom':
$gen = '<generator uri="http://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff