Changeset 4144 for trunk/wp-includes/comment.php

Timestamp:

08/30/2006 09:46:31 PM (18 years ago)

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

File:

• trunk/wp-includes/comment.php (modified) (10 diffs)

trunk/wp-includes/comment.php

@@ -4 +4 @@
     global $wpdb;
 
-    if (1 == get_settings('comment_moderation')) return false; // If moderation is set to manual
-
-    if ( (count(explode('http:', $comment)) - 1) >= get_settings('comment_max_links') )
+    if (1 == get_option('comment_moderation')) return false; // If moderation is set to manual
+
+    if ( (count(explode('http:', $comment)) - 1) >= get_option('comment_max_links') )
         return false; // Check # of external links
 
-    $mod_keys = trim( get_settings('moderation_keys') );
+    $mod_keys = trim( get_option('moderation_keys') );
     if ( !empty($mod_keys) ) {
         $words = explode("\n", $mod_keys );
@@ -34 +34 @@
 
     // Comment whitelisting:
-    if ( 1 == get_settings('comment_whitelist')) {
+    if ( 1 == get_option('comment_whitelist')) {
         if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
             $uri = parse_url($url);
@@ -125 +125 @@
 function get_lastcommentmodified($timezone = 'server') {
     global $cache_lastcommentmodified, $pagenow, $wpdb;
-    $add_seconds_blog = get_settings('gmt_offset') * 3600;
+    $add_seconds_blog = get_option('gmt_offset') * 3600;
     $add_seconds_server = date('Z');
     $now = current_time('mysql', 1);
@@ -234 +234 @@
     }
 
-    $mod_keys = trim( get_settings('blacklist_keys') );
+    $mod_keys = trim( get_option('blacklist_keys') );
     if ('' == $mod_keys )
         return false; // If moderation keys are empty
@@ -387 +387 @@
         $post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
 
-        if ( get_settings('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
+        if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
             wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
     }
@@ -617 +617 @@
     $excerpt = strip_tags($excerpt);
     if ( function_exists('mb_strcut') ) // For international trackbacks
-        $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
+        $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...';
     else
         $excerpt = substr($excerpt, 0, 252) . '...';
@@ -636 +636 @@
 
 function generic_ping($post_id = 0) {
-    $services = get_settings('ping_sites');
+    $services = get_option('ping_sites');
     $services = preg_replace("|(\s)+|", '$1', $services); // Kill dupe lines
     $services = trim($services);
@@ -745 +745 @@
     $title = urlencode($title);
     $excerpt = urlencode($excerpt);
-    $blog_name = urlencode(get_settings('blogname'));
+    $blog_name = urlencode(get_option('blogname'));
     $tb_url = $trackback_url;
     $url = urlencode(get_permalink($ID));
@@ -752 +752 @@
     $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'.$trackback_url['query'] : '') . " HTTP/1.0\r\n";
     $http_request .= 'Host: '.$trackback_url['host']."\r\n";
-    $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
+    $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_option('blog_charset')."\r\n";
     $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
     $http_request .= "User-Agent: WordPress/" . $wp_version;
@@ -790 +790 @@
     $client->debug = false;
     $home = trailingslashit( get_option('home') );
-    if ( !$client->query('weblogUpdates.extendedPing', get_settings('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
-        $client->query('weblogUpdates.ping', get_settings('blogname'), $home);
+    if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+        $client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }