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

Timestamp:

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

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

File:

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

trunk/wp-includes/pluggable.php

@@ -164 +164 @@
                 $headers = "MIME-Version: 1.0\n" .
                         "From: wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . "\n" . 
-                        "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
+                        "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         }
 
@@ -222 +222 @@
                 nocache_headers();
 
-                wp_redirect(get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
+                wp_redirect(get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
                 exit();
         }
@@ -230 +230 @@
 if ( !function_exists('check_admin_referer') ) :
 function check_admin_referer($action = -1) {
-        $adminurl = strtolower(get_settings('siteurl')).'/wp-admin';
+        $adminurl = strtolower(get_option('siteurl')).'/wp-admin';
         $referer = strtolower(wp_get_referer());
         if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
@@ -338 +338 @@
         $comment_author_domain = gethostbyaddr($comment->comment_author_IP);
 
-        $blogname = get_settings('blogname');
+        $blogname = get_option('blogname');
 
         if ( empty( $comment_type ) ) $comment_type = 'comment';
@@ -367 +367 @@
         }
         $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-        $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-        $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+        $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_option('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+        $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_option('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
 
         $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
@@ -384 +384 @@
         $message_headers = "MIME-Version: 1.0\n"
                 . "$from\n"
-                . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
+                . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
         if ( isset($reply_to) )
@@ -408 +408 @@
         global $wpdb;
 
-        if( get_settings( "moderation_notify" ) == 0 )
+        if( get_option( "moderation_notify" ) == 0 )
                 return true; 
     
@@ -424 +424 @@
         $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
         $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-        $notify_message .= sprintf( __('To approve this comment, visit: %s'),  get_settings('siteurl').'/wp-admin/comment.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-        $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-        $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+        $notify_message .= sprintf( __('To approve this comment, visit: %s'),  get_option('siteurl').'/wp-admin/comment.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+        $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_option('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+        $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_option('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
         $notify_message .= sprintf( __('Currently %s comments are waiting for approval. Please visit the moderation panel:'), $comments_waiting ) . "\r\n";
-        $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
-
-        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_settings('blogname'), $post->post_title );
-        $admin_email = get_settings('admin_email');
+        $notify_message .= get_option('siteurl') . "/wp-admin/moderation.php\r\n";
+
+        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
+        $admin_email = get_option('admin_email');
 
         $notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id);
@@ -449 +449 @@
         $user_email = stripslashes($user->user_email);
 
-        $message  = sprintf(__('New user registration on your blog %s:'), get_settings('blogname')) . "\r\n\r\n";
+        $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
         $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
         $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
 
-        @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
+        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
 
         if ( empty($plaintext_pass) )
@@ -460 +460 @@
         $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
         $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-        $message .= get_settings('siteurl') . "/wp-login.php\r\n";
-
-        wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_settings('blogname')), $message);
+        $message .= get_option('siteurl') . "/wp-login.php\r\n";
+
+        wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
 
 }