Changeset 945 for trunk/wp-includes/functions.php

Timestamp:

02/26/2004 04:15:48 PM (21 years ago)

Author:

saxmatt

Message:

Removed global $siteurl and $blogfilename, use get_settings. Syntax fix for wp-db.

File:

• trunk/wp-includes/functions.php (modified) (11 diffs)

trunk/wp-includes/functions.php

@@ -204 +204 @@
 // determine the post ID it represents.
 function url_to_postid($url = '') {
-    global $wpdb, $tableposts, $siteurl;
-
+    global $wpdb, $tableposts;
+
+    $siteurl = get_settings('siteurl');
     // Take a link like 'http://example.com/blog/something'
     // and extract just the '/something':
@@ -537 +538 @@
 function pingWeblogs($blog_ID = 1) {
     // original function by Dries Buytaert for Drupal
-    global $use_weblogsping, $blogname,$siteurl,$blogfilename;
-    if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
+    global $use_weblogsping, $blogname;
+    if ((!(($blogname=="my weblog") && (get_settings('siteurl')=="http://example.com") && (get_settings('blogfilename') == "wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_weblogsping)) {
         $client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);
-        $message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename)));
+        $message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), 
+        new xmlrpcval(get_settings('siteurl') . '/' . get_settings('blogfilename')
+        )));
         $result = $client->send($message);
         if (!$result || $result->faultCode()) {
@@ -569 +572 @@
 // pings CaféLog.com
 function pingCafelog($cafelogID,$title='',$p='') {
-    global $use_cafelogping, $blogname, $siteurl, $blogfilename;
-    if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
+    global $use_cafelogping, $blogname;
+    if ((!(($blogname=="my weblog") && (get_settings('siteurl') == "http://example.com") && (get_settings('blogfilename')=="wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_cafelogping) && ($cafelogID != '')) {
         $client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80);
         $message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p)));
@@ -585 +588 @@
 // pings Blo.gs
 function pingBlogs($blog_ID="1") {
-    global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname, $siteurl, $blogfilename;
-    if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='wp.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
-        $url = ($blodotgsping_url == 'http://example.com') ? $siteurl.'/'.$blogfilename : $blodotgsping_url;
+    global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname;
+    if ((!(($blogname=='my weblog') && (get_settings('siteurl')=='http://example.com') && (get_settings('blogfilename')=='wp.php'))) && (!preg_match('/localhost\//',get_settings('siteurl'))) && ($use_blodotgsping)) {
+        $url = ($blodotgsping_url == 'http://example.com') ? get_settings('siteurl').'/'.get_settings('blogfilename') : $blodotgsping_url;
         $client = new xmlrpc_client('/', 'ping.blo.gs', 80);
         if ($use_rss) {
-            $message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval($blogname), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval($siteurl.'/b2rss.xml')));
+            $message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval($blogname), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval(get_settings('siteurl').'/b2rss.xml')));
         } else {
             $message = new xmlrpcmsg('weblogUpdates.ping', array(new xmlrpcval($blogname), new xmlrpcval($url)));
@@ -658 +661 @@
 
 function make_url_footnote($content) {
-    global $siteurl;
     preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
     $j = 0;
@@ -669 +671 @@
         $link_text = $matches[4][$i];
         $content = str_replace($link_match, $link_text.' '.$link_number, $content);
-        $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? $siteurl.$link_url : $link_url;
+        $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('siteurl') . $link_url : $link_url;
         $links_summary .= "\n".$link_number.' '.$link_url;
     }
@@ -736 +738 @@
 function pingback($content, $post_ID) {
     // original code by Mort (http://mort.mine.nu:8080)
-    global $siteurl, $blogfilename, $wp_version;
+    global $wp_version;
     $log = debug_fopen('./pingback.log', 'a');
     $post_links = array();
@@ -1015 +1017 @@
     global $wpdb, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
-    global $blogfilename, $blogname, $siteurl, $blog_charset;
+    global $blogname, $blog_charset;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
@@ -1076 +1078 @@
     global $wpdb, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
-    global $blogfilename, $blogname, $siteurl, $blog_charset;
+    global $blogname, $blog_charset;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
@@ -1091 +1093 @@
     $notify_message .= "Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
     $notify_message .= "Comment:\r\n".stripslashes($comment->comment_content)."\r\n\r\n";
-    $notify_message .= "To approve this comment, visit: $siteurl/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
-    $notify_message .= "To delete this comment, visit: $siteurl/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
+    $notify_message .= "To approve this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
+    $notify_message .= "To delete this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
     $notify_message .= "Currently $comments_waiting comments are waiting for approval. Please visit the moderation panel:\r\n";
-    $notify_message .= "$siteurl/wp-admin/moderation.php\r\n";
+    $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
 
     $subject = '[' . stripslashes($blogname) . '] Please approve: "' .stripslashes($post->post_title).'"';
@@ -1279 +1281 @@
 
 function is_referer_search_engine($engine = 'google') {
-    global $siteurl;
-
-    $referer = urldecode($_SERVER[HTTP_REFERER]);
+    $siteurl = get_settings('siteurl');
+    $referer = urldecode($_SERVER['HTTP_REFERER']);
     //echo "referer is: $referer<br />";
     if ( ! $engine ) {