diff --git a/wp-blog-header.php b/wp-blog-header.php
index d6f83a1db3..4e69540da8 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -88,8 +88,6 @@ if (!isset($posts_per_page) || $posts_per_page == 0)
$posts_per_page = get_settings('posts_per_page');
$what_to_show = get_settings('what_to_show');
$archive_mode = get_settings('archive_mode');
-$dateformat = stripslashes(get_settings('date_format'));
-$timeformat = stripslashes(get_settings('time_format'));
$time_difference = get_settings('time_difference');
$use_gzipcompression = get_settings('gzipcompression');
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index d5cd8b8fcc..bed2d82f63 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -264,33 +264,37 @@ function url_to_postid($url = '') {
/* Options functions */
function get_settings($setting) {
- global $wpdb, $cache_settings, $use_cache;
+ global $wpdb, $cache_settings, $use_cache;
if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
return false;
}
+
if ((empty($cache_settings)) OR (!$use_cache)) {
$settings = get_alloptions();
$cache_settings = $settings;
} else {
$settings = $cache_settings;
}
- if (!isset($settings->$setting)) {
- return false;
- }
- else {
- return $settings->$setting;
+
+ if (!isset($settings->$setting)) {
+ return false;
+ } else {
+ return stripslashes($settings->$setting);
}
}
function get_alloptions() {
- global $tableoptions, $wpdb;
- $options = $wpdb->get_results("SELECT option_name, option_value FROM $tableoptions");
- if ($options) {
- foreach ($options as $option) {
- $all_options->{$option->option_name} = $option->option_value;
- }
- }
- return $all_options;
+ global $tableoptions, $wpdb;
+ $options = $wpdb->get_results("SELECT option_name, option_value FROM $tableoptions");
+ if ($options) {
+ foreach ($options as $option) {
+ // "When trying to design a foolproof system,
+ // never underestimate the ingenuity of the fools :)"
+ if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+ $all_options->{$option->option_name} = $option->option_value;
+ }
+ }
+ return $all_options;
}
function update_option($option_name, $newvalue) {
@@ -1461,4 +1465,8 @@ function rewrite_rules($matches = '') {
return $rewrite;
}
-?>
+function remove_slashes($string) {
+ return stripslashes(stripslashes($string));
+}
+
+?>
\ No newline at end of file
diff --git a/wp-includes/template-functions-category.php b/wp-includes/template-functions-category.php
index 40c0f1930b..8844da43a7 100644
--- a/wp-includes/template-functions-category.php
+++ b/wp-includes/template-functions-category.php
@@ -103,18 +103,13 @@ function the_category_rss($type = 'rss') {
foreach ($categories as $category) {
$category->cat_name = stripslashes(convert_chars($category->cat_name));
if ('rdf' == $type) {
- echo "\n$category->cat_name";
+ echo "\n\t$category->cat_name";
} else {
- echo "\n$category->cat_name";
+ echo "\n\t$category->cat_name";
}
}
}
-function the_category_unicode() {
- $category = get_the_category();
- $category = apply_filters('the_category_unicode', $category);
- echo convert_chars($category, 'unicode');
-}
function get_the_category_by_ID($cat_ID) {
global $tablecategories, $cache_categories, $use_cache, $wpdb;
@@ -127,7 +122,7 @@ function get_the_category_by_ID($cat_ID) {
return(stripslashes($cat_name));
}
-function get_category_parents($id, $link=FALSE, $separator=' / ', $nicename=FALSE){
+function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = FALSE){
global $tablecategories, $cache_categories;
$chain = "";
$parent = $cache_categories[$id];
@@ -145,10 +140,10 @@ function get_category_parents($id, $link=FALSE, $separator=' / ', $nicename=FALS
return $chain;
}
-function get_category_children($id, $before=' / ', $after='') {
+function get_category_children($id, $before = '/', $after = '') {
global $tablecategories, $cache_categories;
- $c_cache=$cache_categories; // Can't do recursive foreach on a global, have to make a copy
- $chain = "";
+ $c_cache = $cache_categories; // Can't do recursive foreach on a global, have to make a copy
+ $chain = '';
foreach ($c_cache as $category){
if ($category->category_parent == $id){
$chain .= $before.$category->cat_ID.$after;
@@ -158,7 +153,7 @@ function get_category_children($id, $before=' / ', $after='') {
return $chain;
}
-function the_category_ID($echo=true) {
+function the_category_ID($echo = true) {
global $post;
if ($echo)
echo $post->post_category;
@@ -354,4 +349,4 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
}
echo $thelist;
}
-?>
+?>
\ No newline at end of file
diff --git a/wp-includes/template-functions-comment.php b/wp-includes/template-functions-comment.php
index 739bb3f17d..f25e0b8c2f 100644
--- a/wp-includes/template-functions-comment.php
+++ b/wp-includes/template-functions-comment.php
@@ -1,5 +1,30 @@
get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
@@ -70,224 +95,187 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
}
function comment_ID() {
- global $comment;
- echo $comment->comment_ID;
+ global $comment;
+ echo $comment->comment_ID;
}
function comment_author() {
- global $comment;
- $author = stripslashes(stripslashes($comment->comment_author));
- $author = apply_filters('comment_auther', $author);
- $author = convert_chars($author);
- if (!empty($author)) {
- echo $comment->comment_author;
- }
- else {
- echo "Anonymous";
- }
+ global $comment;
+ $author = apply_filters('comment_author', $comment->comment_author);
+ if (empty($author)) {
+ echo 'Anonymous';
+ } else {
+ echo $author;
+ }
}
function comment_author_email() {
- global $comment;
- $email = stripslashes(stripslashes($comment->comment_author_email));
-
- echo antispambot(stripslashes($comment->comment_author_email));
+ global $comment;
+ echo apply_filters('author_email', $comment->comment_author_email);
}
function comment_author_link() {
- global $comment;
- $url = trim(stripslashes($comment->comment_author_url));
- $email = stripslashes($comment->comment_author_email);
- $author = stripslashes($comment->comment_author);
- $author = convert_chars($author);
- $author = wptexturize($author);
- if (empty($author)) {
- $author = "Anonymous";
- }
+ global $comment;
+ $url = apply_filters('comment_url', $comment->comment_author_url);
+ $email = apply_filters('comment_email', $comment->comment_author_email);
+ $author = apply_filters('comment_author', $comment->comment_author);
- $url = str_replace('http://url', '', $url);
- $url = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $url);
- if (empty($url) && empty($email)) {
- echo $author;
- return;
- }
- echo '' . $author . '';
+ if (empty($url) && empty($email)) {
+ echo 'Anonymous';
+ return;
+ }
+
+ echo '' . $author . '';
}
function comment_type($commenttxt = 'Comment', $trackbacktxt = 'Trackback', $pingbacktxt = 'Pingback') {
- global $comment;
- if (preg_match('||', $comment->comment_content)) echo $trackbacktxt;
- elseif (preg_match('||', $comment->comment_content)) echo $pingbacktxt;
- else echo $commenttxt;
+ global $comment;
+ if (preg_match('||', $comment->comment_content))
+ echo $trackbacktxt;
+ elseif (preg_match('||', $comment->comment_content))
+ echo $pingbacktxt;
+ else
+ echo $commenttxt;
}
function comment_author_url() {
- global $comment;
- $url = trim(stripslashes($comment->comment_author_url));
- $url = str_replace(';//', '://', $url);
- $url = (!strstr($url, '://')) ? 'http://'.$url : $url;
- // convert & into &
- $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
- $url = preg_replace('|[^a-z0-9-_.,/:]|i', '', $url);
- if ($url != 'http://url') {
- echo $url;
- }
+ global $comment;
+ echo apply_filters('comment_url', $comment->comment_author_url);
}
function comment_author_email_link($linktext='', $before='', $after='') {
- global $comment;
- $email = $comment->comment_author_email;
- if ((!empty($email)) && ($email != '@')) {
- $display = ($linktext != '') ? $linktext : antispambot(stripslashes($email));
- echo $before;
- echo ''.$display.'';
- echo $after;
- }
+ global $comment;
+ $email = apply_filters('comment_email', $comment->comment_author_email);
+ if ((!empty($email)) && ($email != '@')) {
+ $display = ($linktext != '') ? $linktext : antispambot(stripslashes($email));
+ echo $before;
+ echo "$display";
+ echo $after;
+ }
}
function comment_author_url_link($linktext='', $before='', $after='') {
- global $comment;
- $url = trim(stripslashes($comment->comment_author_url));
- $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
- $url = (!stristr($url, '://')) ? 'http://'.$url : $url;
- $url = preg_replace('|[^a-z0-9-_.,/:]|i', '', $url);
- if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) {
- $display = ($linktext != '') ? $linktext : stripslashes($url);
- echo $before;
- echo ''.$display.'';
- echo $after;
- }
+ global $comment;
+ $url = apply_filters('comment_url', $comment->comment_author_url);
+
+ if ((!empty($url)) && ($url != 'http://') && ($url != 'http://url')) {
+ $display = ($linktext != '') ? $linktext : stripslashes($url);
+ echo $before;
+ echo "$display";
+ echo $after;
+ }
}
function comment_author_IP() {
- global $comment;
- echo stripslashes($comment->comment_author_IP);
+ global $comment;
+ echo $comment->comment_author_IP;
}
function comment_text() {
- global $comment;
- $comment_text = stripslashes($comment->comment_content);
- $comment_text = str_replace('', '', $comment_text);
- $comment_text = str_replace('', '', $comment_text);
- $comment_text = convert_chars($comment_text);
- $comment_text = convert_bbcode($comment_text);
- $comment_text = convert_gmcode($comment_text);
- $comment_text = make_clickable($comment_text);
- $comment_text = balanceTags($comment_text,1);
- $comment_text = apply_filters('comment_text', $comment_text);
- $comment_text = convert_smilies($comment_text);
- echo $comment_text;
+ global $comment;
+ $comment_text = str_replace('', '', $comment->comment_content);
+ $comment_text = str_replace('', '', $comment_text);
+ echo apply_filters('comment_text', $comment_text);
}
function comment_date($d='') {
- global $comment, $dateformat;
- if ($d == '') {
- echo mysql2date($dateformat, $comment->comment_date);
- } else {
- echo mysql2date($d, $comment->comment_date);
- }
+ global $comment;
+ if ('' == $d) {
+ echo mysql2date(get_settings('date_format'), $comment->comment_date);
+ } else {
+ echo mysql2date($d, $comment->comment_date);
+ }
}
function comment_time($d='') {
- global $comment, $timeformat;
- if ($d == '') {
- echo mysql2date($timeformat, $comment->comment_date);
- } else {
- echo mysql2date($d, $comment->comment_date);
- }
+ global $comment;
+ if ($d == '') {
+ echo mysql2date(get_settings('time_format'), $comment->comment_date);
+ } else {
+ echo mysql2date($d, $comment->comment_date);
+ }
}
function comments_rss_link($link_text='Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
- global $id;
- global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
+ global $id;
+ global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
- if ('' != get_settings('permalink_structure')) {
- $url = trailingslashit(get_permalink()) . 'rss2/';
- } else {
- $url = $siteurl.'/'.$commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id;
- }
+ if ('' != get_settings('permalink_structure')) {
+ $url = trailingslashit(get_permalink()) . 'rss2/';
+ } else {
+ $url = $siteurl.'/'.$commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id;
+ }
- $url = ''.$link_text.'';
- echo $url;
+ echo "$link_text";
}
function comment_author_rss() {
- global $comment;
- if (!empty($comment->comment_author)) {
- echo htmlspecialchars(strip_tags(stripslashes($comment->comment_author)));
- }
- else {
- echo "Anonymous";
- }
+ global $comment;
+ if (empty($comment->comment_author)) {
+ echo 'Anonymous';
+ } else {
+ echo htmlspecialchars(apply_filters('comment_author', $comment->comment_author));
+ }
}
function comment_text_rss() {
- global $comment;
- $comment_text = stripslashes($comment->comment_content);
- $comment_text = str_replace('', '', $comment_text);
- $comment_text = str_replace('', '', $comment_text);
- $comment_text = convert_chars($comment_text);
- $comment_text = convert_bbcode($comment_text);
- $comment_text = convert_gmcode($comment_text);
- $comment_text = convert_smilies($comment_text);
- $comment_text = apply_filters('comment_text', $comment_text);
- $comment_text = strip_tags($comment_text);
- $comment_text = htmlspecialchars($comment_text);
- echo $comment_text;
+ global $comment;
+ $comment_text = str_replace('', '', $comment->comment_content);
+ $comment_text = str_replace('', '', $comment_text);
+ $comment_text = apply_filters('comment_text', $comment_text);
+ $comment_text = strip_tags($comment_text);
+ $comment_text = htmlspecialchars($comment_text);
+ echo $comment_text;
}
function comment_link_rss() {
- global $comment;
- echo get_permalink($comment->comment_post_ID).'#comments';
+ global $comment;
+ echo get_permalink($comment->comment_post_ID).'#comments';
}
function permalink_comments_rss() {
- global $comment;
- echo get_permalink($comment->comment_post_ID);
+ global $comment;
+ echo get_permalink($comment->comment_post_ID);
}
function trackback_url($display = true) {
- global $siteurl, $id;
- $tb_url = $siteurl.'/wp-trackback.php/'.$id;
-
- if ('' != get_settings('permalink_structure')) {
- $tb_url = trailingslashit(get_permalink()) . 'trackback/';
- }
-
- if ($display) {
- echo $tb_url;
- } else {
- return $tb_url;
- }
+ global $id;
+ $tb_url = get_settings('siteurl') . '/wp-trackback.php/' . $id;
+
+ if ('' != get_settings('permalink_structure')) {
+ $tb_url = trailingslashit(get_permalink()) . 'trackback/';
+ }
+
+ if ($display) {
+ echo $tb_url;
+ } else {
+ return $tb_url;
+ }
}
function trackback_rdf($timezone = 0) {
- global $siteurl, $id, $HTTP_SERVER_VARS;
- if (!stristr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'W3C_Validator')) {
- echo ''."\n";
- echo '\n";
- echo '';
- }
+ global $siteurl, $id, $HTTP_SERVER_VARS;
+ if (!stristr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'W3C_Validator')) {
+ echo '
+ \n";
+ echo '';
+ }
}
-?>
+?>
\ No newline at end of file
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index ecfbb5bb1c..241f02a7ef 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -204,7 +204,7 @@ function get_archives_link($url, $text, $format = "html", $before = "", $after =
}
function get_archives($type='', $limit='', $format='html', $before = "", $after = "", $show_post_count = false) {
- global $tableposts, $dateformat, $time_difference, $siteurl, $blogfilename;
+ global $tableposts, $time_difference, $siteurl, $blogfilename;
global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb, $start_of_week;
if ('' == $type) {
@@ -234,9 +234,9 @@ function get_archives($type='', $limit='', $format='html', $before = "", $after
$archive_week_end_date_format = 'Y/m/d';
if (!$archive_date_format_over_ride) {
- $archive_day_date_format = $dateformat;
- $archive_week_start_date_format = $dateformat;
- $archive_week_end_date_format = $dateformat;
+ $archive_day_date_format = get_settings('date_format');
+ $archive_week_start_date_format = get_settings('date_format');
+ $archive_week_end_date_format = get_settings('date_format');
}
$now = date('Y-m-d H:i:s',(time() + ($time_difference * 3600)));
@@ -502,12 +502,12 @@ function the_date_xml() {
}
function the_date($d='', $before='', $after='', $echo = true) {
- global $id, $post, $day, $previousday, $dateformat, $newday;
+ global $id, $post, $day, $previousday, $newday;
$the_date = '';
if ($day != $previousday) {
$the_date .= $before;
if ($d=='') {
- $the_date .= mysql2date($dateformat, $post->post_date);
+ $the_date .= mysql2date(get_settings('date_format'), $post->post_date);
} else {
$the_date .= mysql2date($d, $post->post_date);
}
@@ -523,9 +523,9 @@ function the_date($d='', $before='', $after='', $echo = true) {
}
function the_time($d='', $echo = true) {
- global $id, $post, $timeformat;
+ global $id, $post;
if ($d=='') {
- $the_time = mysql2date($timeformat, $post->post_date);
+ $the_time = mysql2date(get_settings('time_format'), $post->post_date);
} else {
$the_time = mysql2date($d, $post->post_date);
}
diff --git a/wp-includes/template-functions-post.php b/wp-includes/template-functions-post.php
index 612857b702..0229371666 100644
--- a/wp-includes/template-functions-post.php
+++ b/wp-includes/template-functions-post.php
@@ -1,5 +1,19 @@
@@ -7,115 +21,87 @@ function get_the_password_form() {
";
- return $output;
+ return $output;
}
function the_ID() {
- global $id;
- echo $id;
+ global $id;
+ echo $id;
}
function the_title($before = '', $after = '', $echo = true) {
- $title = get_the_title();
- $title = convert_smilies($title);
- if (!empty($title)) {
- $title = convert_chars($before.$title.$after);
- $title = apply_filters('the_title', $title);
- if ($echo)
- echo $title;
- else
- return $title;
- }
-}
-function the_title_rss() {
- $title = get_the_title();
- $title = strip_tags($title);
- if (trim($title)) {
- echo convert_chars($title, 'unicode');
- }
-}
-function the_title_unicode($before='',$after='') {
- $title = get_the_title();
- $title = convert_bbcode($title);
- $title = convert_gmcode($title);
- if ($title) {
- $title = convert_chars($before.$title.$after);
- $title = apply_filters('the_title_unicode', $title);
- echo $title;
- }
-}
-function get_the_title() {
- global $post;
- $output = stripslashes($post->post_title);
- if (!empty($post->post_password)) { // if there's a password
- $output = 'Protected: ' . $output;
- }
- return $output;
+ $title = get_the_title();
+ if (!empty($title)) {
+ $title = apply_filters('the_title', $before . $title . $after);
+ if ($echo)
+ echo $title;
+ else
+ return $title;
+ }
}
-function the_content($more_link_text='(more...)', $stripteaser=0, $more_file='') {
+function the_title_rss() {
+ $title = get_the_title();
+ $title = apply_filters('the_title', $title);
+ $title = apply_filters('the_title_rss', $title):
+ echo $title;
+}
+
+function get_the_title() {
+ global $post;
+ $output = stripslashes($post->post_title);
+ if (!empty($post->post_password)) { // if there's a password
+ $output = 'Protected: ' . $output;
+ }
+ return $output;
+}
+
+function the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
$content = get_the_content($more_link_text, $stripteaser, $more_file);
- $content = convert_bbcode($content);
- $content = convert_gmcode($content);
- $content = convert_smilies($content);
- $content = convert_chars($content, 'html');
$content = apply_filters('the_content', $content);
echo $content;
}
function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
- $content = get_the_content($more_link_text, $stripteaser, $more_file);
- $content = convert_bbcode($content);
- $content = convert_gmcode($content);
- $content = convert_chars($content, 'unicode');
- if ($cut && !$encode_html) {
- $encode_html = 2;
- }
- if ($encode_html == 1) {
- $content = htmlspecialchars($content);
- $cut = 0;
- } elseif ($encode_html == 0) {
- $content = make_url_footnote($content);
- } elseif ($encode_html == 2) {
- $content = strip_tags($content);
- }
- if ($cut) {
- $blah = explode(' ', $content);
- if (count($blah) > $cut) {
- $k = $cut;
- $use_dotdotdot = 1;
- } else {
- $k = count($blah);
- $use_dotdotdot = 0;
- }
- for ($i=0; $i<$k; $i++) {
- $excerpt .= $blah[$i].' ';
- }
- $excerpt .= ($use_dotdotdot) ? '...' : '';
- $content = $excerpt;
- }
- echo $content;
+ $content = get_the_content($more_link_text, $stripteaser, $more_file);
+ $content = apply_filters('the_content', $content);
+ if ($cut && !$encode_html) {
+ $encode_html = 2;
+ }
+ if ($encode_html == 1) {
+ $content = htmlspecialchars($content);
+ $cut = 0;
+ } elseif ($encode_html == 0) {
+ $content = make_url_footnote($content);
+ } elseif ($encode_html == 2) {
+ $content = strip_tags($content);
+ }
+ if ($cut) {
+ $blah = explode(' ', $content);
+ if (count($blah) > $cut) {
+ $k = $cut;
+ $use_dotdotdot = 1;
+ } else {
+ $k = count($blah);
+ $use_dotdotdot = 0;
+ }
+ for ($i=0; $i<$k; $i++) {
+ $excerpt .= $blah[$i].' ';
+ }
+ $excerpt .= ($use_dotdotdot) ? '...' : '';
+ $content = $excerpt;
+ }
+ echo $content;
}
-function the_content_unicode($more_link_text='(more...)', $stripteaser=0, $more_file='') {
- $content = get_the_content($more_link_text, $stripteaser, $more_file);
- $content = convert_bbcode($content);
- $content = convert_gmcode($content);
- $content = convert_smilies($content);
- $content = convert_chars($content, 'unicode');
- $content = apply_filters('the_content_unicode', $content);
- echo $content;
-}
-
-function get_the_content($more_link_text='(more...)', $stripteaser=0, $more_file='') {
+function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_file = '') {
global $id, $post, $more, $single, $withcomments, $page, $pages, $multipage, $numpages;
- global $HTTP_SERVER_VARS, $HTTP_COOKIE_VARS, $preview, $cookiehash;
- global $querystring_start, $querystring_equal, $querystring_separator;
+ global $HTTP_SERVER_VARS, $preview, $cookiehash;
global $pagenow;
$output = '';
if (!empty($post->post_password)) { // if there's a password
- if ($HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $post->post_password) { // and it doesn't match the cookie
+ if ($_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) { // and it doesn't match the cookie
$output = get_the_password_form();
return $output;
}
@@ -148,20 +134,13 @@ function get_the_content($more_link_text='(more...)', $stripteaser=0, $more_file
}
function the_excerpt() {
- $excerpt = get_the_excerpt();
- $excerpt = convert_bbcode($excerpt);
- $excerpt = convert_gmcode($excerpt);
- $excerpt = convert_smilies($excerpt);
- $excerpt = convert_chars($excerpt, 'html');
- $excerpt = apply_filters('the_excerpt', $excerpt);
- echo $excerpt;
+ echo apply_filters('the_excerpt', get_the_excerpt());
}
function the_excerpt_rss($cut = 0, $encode_html = 0) {
$output = get_the_excerpt(true);
- $output = convert_bbcode($output);
- $output = convert_gmcode($output);
- $output = convert_chars($output, 'unicode');
+
+ $output = convert_chars($output);
if ($cut && !$encode_html) {
$encode_html = 2;
}
@@ -192,23 +171,13 @@ function the_excerpt_rss($cut = 0, $encode_html = 0) {
echo $output;
}
-function the_excerpt_unicode() {
- $excerpt = get_the_excerpt();
- $excerpt = convert_bbcode($excerpt);
- $excerpt = convert_gmcode($excerpt);
- $excerpt = convert_smilies($excerpt);
- $excerpt = convert_chars($excerpt, 'unicode');
- $excerpt = apply_filters('the_excerpt_unicode', $excerpt);
- echo $excerpt;
-}
-
function get_the_excerpt($fakeit = true) {
global $id, $post;
- global $HTTP_SERVER_VARS, $HTTP_COOKIE_VARS, $preview, $cookiehash;
+ global $HTTP_SERVER_VARS, $preview, $cookiehash;
$output = '';
$output = stripslashes($post->post_excerpt);
if (!empty($post->post_password)) { // if there's a password
- if ($HTTP_COOKIE_VARS['wp-postpass_'.$cookiehash] != $post->post_password) { // and it doesn't match the cookie
+ if ($_COOKIE['wp-postpass_'.$cookiehash] != $post->post_password) { // and it doesn't match the cookie
$output = "There is no excerpt because this is a protected post.";
return $output;
}
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 21462efb45..99fb0c6b5e 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -268,9 +268,6 @@ foreach($wpsmiliestrans as $smiley => $img) {
// Some default filters
add_filter('all', 'wptexturize');
-add_filter('the_content', 'wpautop');
-add_filter('comment_text', 'wpautop');
-add_filter('the_excerpt', 'wpautop');
// Uncomment the following for Textile support
// include_once('textile.php');
diff --git a/wp-settings.php b/wp-settings.php
index 25f674045e..20d1d900e6 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -49,10 +49,6 @@ require_once (ABSPATH . WPINC . '/kses.php');
// accessing a single global $all_settings var
if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
$siteurl = get_settings('siteurl');
- // "When trying to design a foolproof system,
- // never underestimate the ingenuity of the fools :)"
-
- $siteurl = preg_replace('|/+$|', '', $siteurl);
$blogfilename = get_settings('blogfilename');
$blogname = get_settings('blogname');
$blogdescription = get_settings('blogdescription');