summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-17 09:54:18 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-17 09:54:18 +0000
commit42ad115c5b6e5d184a54f825a5c24b19a3b30fb3 (patch)
tree59766fff3e49ebba4947921a3112af40b08bfcea /wp-inst/wp-includes/functions.php
parent041fcf139cf9b18e7fc75f1257283216ee1ac9f0 (diff)
downloadwordpress-mu-42ad115c5b6e5d184a54f825a5c24b19a3b30fb3.tar.gz
wordpress-mu-42ad115c5b6e5d184a54f825a5c24b19a3b30fb3.tar.xz
wordpress-mu-42ad115c5b6e5d184a54f825a5c24b19a3b30fb3.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@506 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/functions.php')
-rw-r--r--wp-inst/wp-includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index fc2e23d..681c4cb 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -931,7 +931,7 @@ function make_url_footnote($content) {
$link_url = $matches[2][$i];
$link_text = $matches[4][$i];
$content = str_replace($link_match, $link_text.' '.$link_number, $content);
- $link_url = ((strtolower(substr($link_url,0,7)) != 'http://')||(strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
+ $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,7)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
$links_summary .= "\n".$link_number.' '.$link_url;
}
$content = strip_tags($content);