Changeset 4144

Timestamp:

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

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (3 diffs)
• wp-admin/admin-header.php (modified) (2 diffs)
• wp-admin/admin.php (modified) (1 diff)
• wp-admin/bookmarklet.php (modified) (1 diff)
• wp-admin/comment.php (modified) (6 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-form.php (modified) (1 diff)
• wp-admin/edit-link-form.php (modified) (1 diff)
• wp-admin/export.php (modified) (1 diff)
• wp-admin/import/blogger.php (modified) (1 diff)
• wp-admin/inline-uploading.php (modified) (1 diff)
• wp-admin/link-add.php (modified) (1 diff)
• wp-admin/list-manipulation-js.php (modified) (1 diff)
• wp-admin/menu-header.php (modified) (2 diffs)
• wp-admin/moderation.php (modified) (2 diffs)
• wp-admin/options-discussion.php (modified) (4 diffs)
• wp-admin/options-general.php (modified) (4 diffs)
• wp-admin/options-misc.php (modified) (3 diffs)
• wp-admin/options-permalink.php (modified) (4 diffs)
• wp-admin/options-reading.php (modified) (3 diffs)
• wp-admin/options-writing.php (modified) (4 diffs)
• wp-admin/options.php (modified) (3 diffs)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (5 diffs)
• wp-admin/post-new.php (modified) (3 diffs)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/update-links.php (modified) (1 diff)
• wp-admin/users.php (modified) (2 diffs)
• wp-atom.php (modified) (3 diffs)
• wp-comments-post.php (modified) (1 diff)
• wp-commentsrss2.php (modified) (3 diffs)
• wp-content/plugins/wp-db-backup.php (modified) (10 diffs)
• wp-content/themes/classic/comments-popup.php (modified) (3 diffs)
• wp-content/themes/default/comments-popup.php (modified) (3 diffs)
• wp-content/themes/default/functions.php (modified) (4 diffs)
• wp-content/themes/default/header.php (modified) (1 diff)
• wp-includes/author-template.php (modified) (2 diffs)
• wp-includes/bookmark-template.php (modified) (8 diffs)
• wp-includes/bookmark.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/comment-template.php (modified) (5 diffs)
• wp-includes/comment.php (modified) (10 diffs)
• wp-includes/cron.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/feed.php (modified) (3 diffs)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (13 diffs)
• wp-includes/general-template.php (modified) (17 diffs)
• wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (14 diffs)
• wp-includes/pluggable.php (modified) (10 diffs)
• wp-includes/post-template.php (modified) (5 diffs)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/query.php (modified) (3 diffs)
• wp-includes/registration.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/theme.php (modified) (4 diffs)
• wp-includes/vars.php (modified) (1 diff)
• wp-links-opml.php (modified) (1 diff)
• wp-login.php (modified) (8 diffs)
• wp-mail.php (modified) (4 diffs)
• wp-rdf.php (modified) (2 diffs)
• wp-register.php (modified) (6 diffs)
• wp-rss.php (modified) (2 diffs)
• wp-rss2.php (modified) (3 diffs)
• wp-settings.php (modified) (3 diffs)
• wp-trackback.php (modified) (2 diffs)
• xmlrpc.php (modified) (7 diffs)

trunk/wp-admin/admin-functions.php

@@ -336 +336 @@
 
         $post->post_status = 'draft';
-        $post->comment_status = get_settings('default_comment_status');
-        $post->ping_status = get_settings('default_ping_status');
-        $post->post_pingback = get_settings('default_pingback_flag');
-        $post->post_category = get_settings('default_category');
+        $post->comment_status = get_option('default_comment_status');
+        $post->ping_status = get_option('default_ping_status');
+        $post->post_pingback = get_option('default_pingback_flag');
+        $post->post_category = get_option('default_category');
         $post->post_content = apply_filters('default_content', $post_content);
         $post->post_title = apply_filters('default_title', $post_title);
@@ -1107 +1107 @@
         echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
 
-        $time_adj = time() + (get_settings('gmt_offset') * 3600);
+        $time_adj = time() + (get_option('gmt_offset') * 3600);
         $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
         $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
@@ -1624 +1624 @@
 
 function get_home_path() {
-        $home = get_settings('home');
-        if ($home != '' && $home != get_settings('siteurl')) {
+        $home = get_option('home');
+        if ($home != '' && $home != get_option('siteurl')) {
                 $home_path = parse_url($home);
                 $home_path = $home_path['path'];

trunk/wp-admin/admin-header.php

@@ -16 +16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
-<link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 <script type="text/javascript">
 //<![CDATA[
@@ -42 +42 @@
 <body>
 <div id="wphead">
-<h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
+<h1><?php echo wptexturize(get_option(('blogname'))); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
 </div>
-<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>
+<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>
 
 <?php

trunk/wp-admin/admin.php

@@ -20 +20 @@
 wp_get_current_user();
 
-$posts_per_page = get_settings('posts_per_page');
-$what_to_show = get_settings('what_to_show');
-$date_format = get_settings('date_format');
-$time_format = get_settings('time_format');
+$posts_per_page = get_option('posts_per_page');
+$what_to_show = get_option('what_to_show');
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));

trunk/wp-admin/bookmarklet.php

@@ -51 +51 @@
 <head>
 <title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <link rel="stylesheet" href="wp-admin.css" type="text/css" />
 

trunk/wp-admin/comment.php

@@ -63 +63 @@
         echo "<p>" . __('Are you sure you want to do that?') . "</p>\n";
 
-        echo "<form action='".get_settings('siteurl')."/wp-admin/comment.php' method='get'>\n";
+        echo "<form action='".get_option('siteurl')."/wp-admin/comment.php' method='get'>\n";
         wp_nonce_field($nonce_action);
         echo "<input type='hidden' name='action' value='$formaction' />\n";
@@ -73 +73 @@
         echo "<input type='submit' value='" . __('Yes') . "' />";
         echo "&nbsp;&nbsp;";
-        echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit-comments.php';\" />\n";
+        echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_option('siteurl') ."/wp-admin/edit-comments.php';\" />\n";
         echo "</form>\n";
         echo "</div>\n";
@@ -107 +107 @@
                 wp_redirect(wp_get_referer());
         } else {
-                wp_redirect(get_settings('siteurl') .'/wp-admin/edit-comments.php');
+                wp_redirect(get_option('siteurl') .'/wp-admin/edit-comments.php');
         }
         exit();
@@ -134 +134 @@
                 wp_redirect(wp_get_referer());
         } else {
-                wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+                wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
         }
         exit();
@@ -157 +157 @@
 
         wp_set_comment_status($comment->comment_ID, "approve");
-        if (get_settings("comments_notify") == true) {
+        if (get_option("comments_notify") == true) {
                 wp_notify_postauthor($comment->comment_ID);
         }
@@ -165 +165 @@
                 wp_redirect(wp_get_referer());
         } else {
-                wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
+                wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
         }
         exit();

trunk/wp-admin/edit-form-advanced.php

@@ -76 +76 @@
 <div class="dbx-content">
 <p id="jaxcat"></p>
-<ul id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></ul></div>
+<ul id="categorychecklist"><?php dropdown_categories(get_option('default_category')); ?></ul></div>
 </fieldset>
 

trunk/wp-admin/edit-form.php

@@ -35 +35 @@
 <?php the_quicktags(); ?>
 <?php
- $rows = get_settings('default_post_edit_rows');
+ $rows = get_option('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
      $rows = 10;

trunk/wp-admin/edit-link-form.php

@@ -44 +44 @@
 <div class="dbx-content">
 <p id="jaxcat"></p>
-<ul id="categorychecklist"><?php dropdown_link_categories(get_settings('default_link_category')); ?></ul>
+<ul id="categorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
 </div>
 </fieldset>

trunk/wp-admin/export.php

@@ -29 +29 @@
 header('Content-Type: application/octet-stream');
 header("Content-Disposition: attachment; filename=$filename");
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 //$posts = query_posts('');
 $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC");

trunk/wp-admin/import/blogger.php

@@ -602 +602 @@
                         header('Content-Type: text/html; charset=utf-8');
 
-                        $this->import = get_settings('import-blogger');
+                        $this->import = get_option('import-blogger');
 
                         if ( false === $this->import ) {

trunk/wp-admin/inline-uploading.php

@@ -284 +284 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title></title>
 <meta http-equiv="imagetoolbar" content="no" />

trunk/wp-admin/link-add.php

@@ -28 +28 @@
 
 <div class="wrap">
-<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your bookmarks! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
+<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your bookmarks! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
 </div>
 

trunk/wp-admin/list-manipulation-js.php

@@ -2 +2 @@
 require_once('admin.php');
 cache_javascript_headers();
-$handler =  get_settings( 'siteurl' ) . '/wp-admin/admin-ajax.php';
+$handler =  get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php';
 ?>
 addLoadEvent(function(){theList=new listMan();});

trunk/wp-admin/menu-header.php

@@ -14 +14 @@
         if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
                 if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
-                        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                        echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
                 else
-                        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+                        echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
         }
 }
@@ -43 +43 @@
 if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
         if ( 'admin.php' == $pagenow )
-                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
         else
-                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
+                echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
  } else {
-        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+        echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
  }
 endforeach;

trunk/wp-admin/moderation.php

@@ -48 +48 @@
                         case 'approve':
                                 wp_set_comment_status($key, 'approve');
-                                if ( get_settings('comments_notify') == true ) {
+                                if ( get_option('comments_notify') == true ) {
                                         wp_notify_postauthor($key);
                                 }
@@ -126 +126 @@
     foreach($comments as $comment) {
         ++$i;
-        $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date);
+        $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
         $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'");
         if ($i % 2) $class = 'js-unapproved alternate';

trunk/wp-admin/options-discussion.php

@@ -28 +28 @@
 <li> 
 <label for="default_pingback_flag"> 
-<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> /> 
+<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
 <?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> 
 </li> 
 <li> 
 <label for="default_ping_status"> 
-<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> /> 
+<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> 
 <?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> 
 </li> 
 <li> 
 <label for="default_comment_status"> 
-<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_settings('default_comment_status')); ?> /> 
+<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> 
 <?php _e('Allow people to post comments on the article') ?></label> 
 </li> 
@@ -48 +48 @@
 <li> 
 <label for="comments_notify"> 
-<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> /> 
+<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> /> 
 <?php _e('Anyone posts a comment') ?> </label> 
 </li> 
 <li> 
 <label for="moderation_notify"> 
-<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> /> 
+<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> /> 
 <?php _e('A comment is held for moderation') ?> </label> 
 </li> 
@@ -63 +63 @@
 <li>
 <label for="comment_moderation"> 
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> /> 
+<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> 
 <?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label> 
 </li> 
-<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
-<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
+<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
+<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
 </ul> 
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Moderation') ?></legend>
-<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
+<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
@@ -89 +89 @@
 </p>
 <p><label for="open_proxy_check"> 
-<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> /> 
+<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_option('open_proxy_check')); ?> /> 
 <?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
 </fieldset>

trunk/wp-admin/options-general.php

@@ -40 +40 @@
 <th scope="row"><?php _e('Membership:') ?></th> 
 <td> <label for="users_can_register"> 
-<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> /> 
+<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> /> 
 <?php _e('Anyone can register') ?></label><br />
 <label for="comment_registration">
-<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> /> 
+<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> /> 
 <?php _e('Users must be registered and logged in to comment') ?>
 </label>
@@ -51 +51 @@
 <th scope="row"><?php _e('New User Default Role:') ?></th> 
 <td><label for="default_role"> 
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_settings('default_role') ); ?></select></label>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
 </td> 
 </tr> 
@@ -70 +70 @@
 <th scope="row"><?php _e('Default date format:') ?></th>
 <td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
-<?php _e('Output:') ?> <strong><?php echo mysql2date(get_settings('date_format'), current_time('mysql')); ?></strong></td>
+<?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Default time format:') ?></th>
 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
-<?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
+<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
 </tr> 
 <tr>
@@ -86 +86 @@
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
-        $selected = (get_settings('start_of_week') == $day_index) ? 'selected="selected"' : '';
+        $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
         echo "\n\t<option value='$day_index' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
 endfor;

trunk/wp-admin/options-misc.php

@@ -18 +18 @@
 <tr valign="top">
 <th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
-<td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_settings('upload_path')), 1); ?>" size="40" />
+<td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo wp_specialchars(str_replace(ABSPATH, '', get_option('upload_path')), 1); ?>" size="40" />
 <br />
 <?php _e('Default is <code>wp-content/uploads</code>'); ?>
@@ -27 +27 @@
 <td>
 <label for="uploads_use_yearmonth_folders">
-<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_settings('uploads_use_yearmonth_folders')); ?> />
+<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
 <?php _e('Organize my uploads into month- and year-based folders'); ?>
 </label>
@@ -35 +35 @@
 </fieldset>
 
-<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_settings('use_linksupdate')); ?> />
+<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
 <label for="use_linksupdate"><?php _e('Track Bookmarks&#8217; Update Times') ?></label></p>
 <p>
-<label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_settings('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
+<label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_option('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
 </p>
 

trunk/wp-admin/options-permalink.php

@@ -76 +76 @@
 }
 
-$permalink_structure = get_settings('permalink_structure');
-$category_base = get_settings('category_base');
+$permalink_structure = get_option('permalink_structure');
+$category_base = get_option('category_base');
 
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
@@ -123 +123 @@
         <label>
 <input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> 
-<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
+<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_option('home'); ?>/?p=123</code></span>
    </label>
 </p>
@@ -129 +129 @@
         <label>
 <input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> 
-<?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
+<?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
    </label>
 </p>
@@ -135 +135 @@
         <label>
 <input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> 
-<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
+<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></span>
    </label>
 </p>

trunk/wp-admin/options-reading.php

@@ -55 +55 @@
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> 
 <select name="what_to_show" id="what_to_show" > 
-<option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option> 
-<option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option> 
+<option value="days" <?php selected('days', get_option('what_to_show')); ?>><?php _e('days') ?></option> 
+<option value="posts" <?php selected('posts', get_option('what_to_show')); ?>><?php _e('posts') ?></option> 
 </select>
 </td> 
@@ -73 +73 @@
 <th scope="row"><?php _e('For each article, show:') ?> </th>
 <td>
-<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>      /> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
+<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>        /> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
 </td>
 </tr> 
@@ -87 +87 @@
 </table> 
 <p>
-<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> /> 
+<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_option('gzipcompression')); ?> /> 
 <?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
 </p>

trunk/wp-admin/options-writing.php

@@ -22 +22 @@
 <td>
 <label for="rich_editing">
-<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_settings('rich_editing')); ?> />
+<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_option('rich_editing')); ?> />
 <?php _e('Users should use the visual rich editor by default') ?></label><br />
 <label for="use_smilies">
-<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
+<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
-<label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
+<label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
 </td>
 </tr>
@@ -36 +36 @@
 $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
 foreach ($categories as $category) :
-if ($category->cat_ID == get_settings('default_category')) $selected = " selected='selected'";
+if ($category->cat_ID == get_option('default_category')) $selected = " selected='selected'";
 else $selected = '';
 echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
@@ -48 +48 @@
 <?php
 foreach ($categories as $category) :
-if ($category->cat_ID == get_settings('default_link_category')) $selected = " selected='selected'";
+if ($category->cat_ID == get_option('default_link_category')) $selected = " selected='selected'";
 else $selected = '';
 echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
@@ -85 +85 @@
 //Alreay have $categories from default_category
 foreach ($categories as $category) :
-if ($category->cat_ID == get_settings('default_email_category')) $selected = " selected='selected'";
+if ($category->cat_ID == get_option('default_email_category')) $selected = " selected='selected'";
 else $selected = '';
 echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";

trunk/wp-admin/options.php

@@ -88 +88 @@
 
         // Save for later.
-        $old_siteurl = get_settings('siteurl');
-        $old_home = get_settings('home');
+        $old_siteurl = get_option('siteurl');
+        $old_home = get_option('home');
 
         if ($options) {
@@ -105 +105 @@
         if ($any_changed) {
                         // If siteurl or home changed, reset cookies.
-                        if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
+                        if ( get_option('siteurl') != $old_siteurl || get_option('home') != $old_home ) {
                                 // If home changed, write rewrite rules to new location.
                                 $wp_rewrite->flush_rules();
@@ -111 +111 @@
                                 wp_clearcookie();
                                 // Set cookies for new paths.
-                                wp_setcookie($user_login, $user_pass_md5, true, get_settings('home'), get_settings('siteurl'));
+                                wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl'));
                         }
 

trunk/wp-admin/page.php

@@ -145 +145 @@
 
         $sendback = wp_get_referer();
-        if (strstr($sendback, 'page.php')) $sendback = get_settings('siteurl') .'/wp-admin/page.php';
-        elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
+        if (strstr($sendback, 'page.php')) $sendback = get_option('siteurl') .'/wp-admin/page.php';
+        elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
         $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
         wp_redirect($sendback);

trunk/wp-admin/plugins.php

@@ -5 +5 @@
         if ('activate' == $_GET['action']) {
                 check_admin_referer('activate-plugin_' . $_GET['plugin']);
-                $current = get_settings('active_plugins');
+                $current = get_option('active_plugins');
                 if (!in_array($_GET['plugin'], $current)) {
                         $current[] = trim( $_GET['plugin'] );
@@ -16 +16 @@
         } else if ('deactivate' == $_GET['action']) {
                 check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
-                $current = get_settings('active_plugins');
+                $current = get_option('active_plugins');
                 array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
                 update_option('active_plugins', $current);
@@ -31 +31 @@
 // If any plugins don't exist, axe 'em
 
-$check_plugins = get_settings('active_plugins');
+$check_plugins = get_option('active_plugins');
 
 // Sanity check.  If the active plugin list is not an array, make it an
@@ -44 +44 @@
 foreach ($check_plugins as $check_plugin) {
         if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
-                        $current = get_settings('active_plugins');
+                        $current = get_option('active_plugins');
                         $key = array_search($check_plugin, $current);
                         if ( false !== $key && NULL !== $key ) {
@@ -68 +68 @@
 <?php
 
-if ( get_settings('active_plugins') )
-        $current_plugins = get_settings('active_plugins');
+if ( get_option('active_plugins') )
+        $current_plugins = get_option('active_plugins');
 
 $plugins = get_plugins();

trunk/wp-admin/post-new.php

@@ -12 +12 @@
 <p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
 You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
-When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
+When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_option('admin_email')); ?>
 </p>
 </div>
@@ -63 +63 @@
 if ($is_NS4 || $is_gecko) {
 ?>
-<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a> 
+<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_option('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_option('blogname'))); ?></a> 
 <?php
 } else if ($is_winIE) {
 ?>
-<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
+<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_option('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_option('blogname')); ?></a>
 <script type="text/javascript">
 <!--
@@ -82 +82 @@
 } else if ($is_opera) {
 ?>
-<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
+<a href="javascript:location.href='<?php echo get_option('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_option('blogname')); ?></a> 
 <?php
 } else if ($is_macIE) {
 ?>
-<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
+<a href="javascript:Q='';location.href='<?php echo get_option('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_option('blogname')); ?></a> 
 <?php
 }

trunk/wp-admin/post.php

@@ -158 +158 @@
 
         $sendback = wp_get_referer();
-        if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post-new.php';
-        elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php';
+        if (strstr($sendback, 'post.php')) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
+        elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
         $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
         wp_redirect($sendback);

trunk/wp-admin/update-links.php

@@ -17 +17 @@
 $http_request  = "POST /updated-batch/ HTTP/1.0\r\n";
 $http_request .= "Host: api.pingomatic.com\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 . "\r\n";

trunk/wp-admin/users.php

@@ -437 +437 @@
 <div class="wrap">
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
-<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
+<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser">
 <?php wp_nonce_field('add-user') ?>
@@ -476 +476 @@
                         <?php
                         if ( !$new_user_role )
-                                $new_user_role = get_settings('default_role');
+                                $new_user_role = get_option('default_role');
                         wp_dropdown_roles($new_user_role);
                         ?>

trunk/wp-atom.php

@@ -6 +6 @@
 }
 
-header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: application/atom+xml; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <feed version="0.3"
   xmlns="http://purl.org/atom/ns#"
@@ -36 +36 @@
                 <?php the_category_rss('rdf') ?> 
                 <summary type="text/plain" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_settings('rss_use_excerpt') ) : ?>
+<?php if ( !get_option('rss_use_excerpt') ) : ?>
                 <content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
 <?php endif; ?>
@@ -42 +42 @@
 <?php do_action('atom_entry'); ?>
         </entry>
-        <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
+        <?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
 </feed>

trunk/wp-comments-post.php

@@ -37 +37 @@
 $comment_type = '';
 
-if ( get_settings('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && !$user->ID ) {
         if ( 6 > strlen($comment_author_email) || '' == $comment_author )
                 wp_die( __('Error: please fill the required fields (name, email).') );

trunk/wp-commentsrss2.php

@@ -6 +6 @@
 }
 
-header('Content-type: text/xml;charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml;charset=' . get_option('blog_charset'), true);
 
-echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; 
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; 
 ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
@@ -35 +35 @@
                         AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish' 
                         AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "' 
-                        ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
+                        ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
                 } else { // if no post id passed in, we'll just ue the last 10 comments.
                         $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, 
@@ -42 +42 @@
                         LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish' 
                         AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "'  
-                        ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
+                        ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
                 }
         // this line is WordPress' motor, do not delete it.

trunk/wp-content/plugins/wp-db-backup.php

@@ -164 +164 @@
 
                 $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
-                $download_uri = get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$backup_filename}";
+                $download_uri = get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$backup_filename}";
                 switch($_POST['deliver']) {
                 case 'http':
@@ -316 +316 @@
                         } elseif ('http' == $_POST['deliver']) {
                                 $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
-                                header('Refresh: 3; ' . get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$this->backup_file}");
+                                header('Refresh: 3; ' . get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$this->backup_file}");
                         }
                         // we do this to say we're done.
@@ -620 +620 @@
                                 $msg = sprintf(__('File not found:%s'), "<br /><strong>$filename</strong><br />");
                                 $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
-                                $msg .= '<br /><a href="' . get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}" . '">' . __('Return to Backup');
+                                $msg .= '<br /><a href="' . get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}" . '">' . __('Return to Backup');
                         die($msg);
                         }
@@ -633 +633 @@
 
                         if (! is_email ($recipient)) {
-                                $recipient = get_settings('admin_email');
+                                $recipient = get_option('admin_email');
                         }
                         $randomish = md5(time());
@@ -643 +643 @@
                         $headers = "MIME-Version: 1.0\n";
                         $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\n";
-                        $headers .= 'From: ' . get_settings('admin_email') . "\n";
+                        $headers .= 'From: ' . get_option('admin_email') . "\n";
 
                         $message = sprintf(__("Attached to this email is\n   %1s\n   Size:%2s kilobytes\n"), $filename, round(filesize($diskfile)/1024));
@@ -686 +686 @@
                         switch($_POST['deliver']) {
                         case 'http':
-                                $feedback .= '<br />' . sprintf(__('Your backup file: <a href="%1s">%2s</a> should begin downloading shortly.'), get_settings('siteurl') . "/{$this->backup_dir}{$this->backup_file}", $this->backup_file);
+                                $feedback .= '<br />' . sprintf(__('Your backup file: <a href="%1s">%2s</a> should begin downloading shortly.'), get_option('siteurl') . "/{$this->backup_dir}{$this->backup_file}", $this->backup_file);
                                 break;
                         case 'smtp':
                                 if (! is_email($_POST['backup_recipient'])) {
-                                        $feedback .= get_settings('admin_email');
+                                        $feedback .= get_option('admin_email');
                                 } else {
                                         $feedback .= $_POST['backup_recipient'];
@@ -698 +698 @@
                         case 'none':
                                 $feedback .= '<br />' . __('Your backup file has been saved on the server. If you would like to download it now, right click and select "Save As"');
-                                $feedback .= ':<br /> <a href="' . get_settings('siteurl') . "/{$this->backup_dir}$file\">$file</a> : " . sprintf(__('%s bytes'), filesize(ABSPATH . $this->backup_dir . $file));
+                                $feedback .= ':<br /> <a href="' . get_option('siteurl') . "/{$this->backup_dir}$file\">$file</a> : " . sprintf(__('%s bytes'), filesize(ABSPATH . $this->backup_dir . $file));
                         }
                         $feedback .= '</p></div>';
@@ -782 +782 @@
                 echo '<label style="display:block;"><input type="radio" checked="checked" name="deliver" value="http" /> ' . __('Download to your computer') . '</label>';
                 echo '<div><input type="radio" name="deliver" id="do_email" value="smtp" /> ';
-                echo '<label for="do_email">'.__('Email backup to:').'</label><input type="text" name="backup_recipient" size="20" value="' . get_settings('admin_email') . '" />';
+                echo '<label for="do_email">'.__('Email backup to:').'</label><input type="text" name="backup_recipient" size="20" value="' . get_option('admin_email') . '" />';
 
                 // Check DB dize.
@@ -810 +810 @@
                 if (function_exists('wp_cron_init')) {
                         echo '<fieldset class="options"><legend>' . __('Scheduled Backup') . '</legend>';
-                        $datetime = get_settings('date_format') . ' @ ' . get_settings('time_format');
+                        $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
                         echo '<p>' . __('Last WP-Cron Daily Execution') . ': ' . date($datetime, get_option('wp_cron_daily_lastrun')) . '<br />';
                         echo __('Next WP-Cron Daily Execution') . ': ' . date($datetime, (get_option('wp_cron_daily_lastrun') + 86400)) . '</p>';
@@ -829 +829 @@
                         $cron_recipient = get_option('wp_cron_backup_recipient');
                         if (! is_email($cron_recipient)) {
-                                $cron_recipient = get_settings('admin_email');
+                                $cron_recipient = get_option('admin_email');
                         }
                         echo __('Email backup to:') . ' <input type="text" name="cron_backup_recipient" size="20" value="' . $cron_recipient . '" />';

trunk/wp-content/themes/classic/comments-popup.php

@@ -7 +7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-     <title><?php echo get_settings('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
+     <title><?php echo get_option('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
 
-        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <style type="text/css" media="screen">
                 @import url( <?php bloginfo('stylesheet_url'); ?> );
@@ -18 +18 @@
 <body id="commentspopup">
 
-<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
+<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
 
 <h2 id="comments"><?php _e("Comments"); ?></h2>
 
-<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
+<p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
 
 <?php if ('open' == $post->ping_status) { ?>
@@ -56 +56 @@
 <p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
 
-<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
         <p>
           <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />

trunk/wp-content/themes/default/comments-popup.php

@@ -7 +7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-     <title><?php echo get_settings('blogname'); ?> - Comments on <?php the_title(); ?></title>
+     <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
 
-        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <style type="text/css" media="screen">
                 @import url( <?php bloginfo('stylesheet_url'); ?> );
@@ -18 +18 @@
 <body id="commentspopup">
 
-<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
+<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
 
 <h2 id="comments">Comments</h2>
 
-<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
+<p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
 
 <?php if ('open' == $post->ping_status) { ?>
@@ -56 +56 @@
 <p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
 
-<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
         <p>
           <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />

trunk/wp-content/themes/default/functions.php

@@ -22 +22 @@
 
 function kubrick_header_image() {
-        return apply_filters('kubrick_header_image', get_settings('kubrick_header_image'));
+        return apply_filters('kubrick_header_image', get_option('kubrick_header_image'));
 }
 
@@ -51 +51 @@
 
 function kubrick_header_color() {
-        return apply_filters('kubrick_header_color', get_settings('kubrick_header_color'));
+        return apply_filters('kubrick_header_color', get_option('kubrick_header_color'));
 }
 
@@ -63 +63 @@
 
 function kubrick_header_display() {
-        return apply_filters('kubrick_header_display', get_settings('kubrick_header_display'));
+        return apply_filters('kubrick_header_display', get_option('kubrick_header_display'));
 }
 
@@ -94 +94 @@
 
                                         if ( isset($_REQUEST['toggledisplay']) ) {
-                                                if ( false === get_settings('kubrick_header_display') )
+                                                if ( false === get_option('kubrick_header_display') )
                                                         update_option('kubrick_header_display', 'none');
                                                 else

trunk/wp-content/themes/default/header.php

@@ -34 +34 @@
 <div id="header">
         <div id="headerimg">
-                <h1><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
+                <h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
                 <div class="description"><?php bloginfo('description'); ?></div>
         </div>

trunk/wp-includes/author-template.php

@@ -175 +175 @@
 
         if ( empty($link) ) {
-                $file = get_settings('home') . '/';
+                $file = get_option('home') . '/';
                 $link = $file . '?author=' . $auth_ID;
         } else {
@@ -184 +184 @@
                 }
                 $link = str_replace('%author%', $author_nicename, $link);
-                $link = get_settings('home') . trailingslashit($link);
+                $link = get_option('home') . trailingslashit($link);
         }
 

trunk/wp-includes/bookmark-template.php

@@ -94 +94 @@
                 $output .= $before;
                 if ( $show_updated && $row->recently_updated )
-                        $output .= get_settings('links_recently_updated_prepend');
+                        $output .= get_option('links_recently_updated_prepend');
                 $the_link = '#';
                 if ( !empty($row->link_url) )
@@ -108 +108 @@
                 if ( $show_updated )
                         if (substr($row->link_updated_f, 0, 2) != '00')
-                                $title .= ' (Last updated ' . date(get_settings('links_updated_date_format'), $row->link_updated_f + (get_settings('gmt_offset') * 3600)) . ')';
+                                $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
 
                 if ( '' != $title )
@@ -125 +125 @@
                                 $output .= "<img src=\"$row->link_image\" $alt $title />";
                         else // If it's a relative path
-                                $output .= "<img src=\"" . get_settings('siteurl') . "$row->link_image\" $alt $title />";
+                                $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
                 } else {
                         $output .= $name;
@@ -133 +133 @@
 
                 if ( $show_updated && $row->recently_updated )
-                        $output .= get_settings('links_recently_updated_append');
+                        $output .= get_option('links_recently_updated_append');
 
                 if ( $show_description && '' != $desc )
@@ -257 +257 @@
                 $output .= $before;
                 if ( $show_updated && $bookmark->recently_updated )
-                        $output .= get_settings('links_recently_updated_prepend');
+                        $output .= get_option('links_recently_updated_prepend');
 
                 $the_link = '#';
@@ -273 +273 @@
                 if ( $show_updated )
                         if ( '00' != substr($bookmark->link_updated_f, 0, 2) )
-                                $title .= ' (Last updated ' . date(get_settings('links_updated_date_format'), $bookmark->link_updated_f + (get_settings('gmt_offset') * 3600)) . ')';
+                                $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
 
                 if ( '' != $title )
@@ -290 +290 @@
                                 $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
                         else // If it's a relative path
-                                $output .= "<img src=\"" . get_settings('siteurl') . "$bookmark->link_image\" $alt $title />";
+                                $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
                 } else {
                         $output .= $name;
@@ -298 +298 @@
 
                 if ( $show_updated && $bookmark->recently_updated )
-                        $output .= get_settings('links_recently_updated_append');
+                        $output .= get_option('links_recently_updated_append');
 
                 if ( $show_description && '' != $desc )

trunk/wp-includes/bookmark.php

@@ -92 +92 @@
         }
 
-        if (get_settings('links_recently_updated_time')) {
-                $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_settings('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
+        if (get_option('links_recently_updated_time')) {
+                $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
         } else {
                 $recently_updated_test = '';

trunk/wp-includes/category-template.php

@@ -24 +24 @@
 
         if ( empty($catlink) ) {
-                $file = get_settings('home') . '/';
+                $file = get_option('home') . '/';
                 $catlink = $file . '?cat=' . $category_id;
         } else {
@@ -34 +34 @@
 
                 $catlink = str_replace('%category%', $category_nicename, $catlink);
-                $catlink = get_settings('home') . trailingslashit($catlink);
+                $catlink = get_option('home') . trailingslashit($catlink);
         }
         return apply_filters('category_link', $catlink, $category_id);

trunk/wp-includes/classes.php

@@ -9 +9 @@
                 global $wpdb;
 
-                $list = explode("\n", get_settings('moderation_keys') );
+                $list = explode("\n", get_option('moderation_keys') );
                 $list = array_unique( $list );
                 $this->spam_words = $list;
@@ -117 +117 @@
                         $req_uri = $req_uri_array[0];
                         $self = $_SERVER['PHP_SELF'];
-                        $home_path = parse_url(get_settings('home'));
+                        $home_path = parse_url(get_option('home'));
                         $home_path = $home_path['path'];
                         $home_path = trim($home_path, '/');

trunk/wp-includes/comment-template.php

@@ -91 +91 @@
         global $comment;
         if ( '' == $d )
-                $date = mysql2date( get_settings('date_format'), $comment->comment_date);
+                $date = mysql2date( get_option('date_format'), $comment->comment_date);
         else
                 $date = mysql2date($d, $comment->comment_date);
@@ -188 +188 @@
         $comment_date = $gmt? $comment->comment_date_gmt : $comment->comment_date;
         if ( '' == $d )
-                $date = mysql2date(get_settings('time_format'), $comment_date);
+                $date = mysql2date(get_option('time_format'), $comment_date);
         else
                 $date = mysql2date($d, $comment_date);
@@ -223 +223 @@
 function get_trackback_url() {
         global $id;
-        $tb_url = get_settings('siteurl') . '/wp-trackback.php?p=' . $id;
-
-        if ( '' != get_settings('permalink_structure') )
+        $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
+
+        if ( '' != get_option('permalink_structure') )
                 $tb_url = trailingslashit(get_permalink()) . 'trackback/';
 
@@ -277 +277 @@
                 return;
 
-        $req = get_settings('require_name_email');
+        $req = get_option('require_name_email');
         $commenter = wp_get_current_commenter();
         extract($commenter);
@@ -335 +335 @@
         if ($wpcommentsjavascript) {
                 if ( empty($wpcommentspopupfile) )
-                        $home = get_settings('home');
+                        $home = get_option('home');
                 else
-                        $home = get_settings('siteurl');
+                        $home = get_option('siteurl');
                 echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
                 echo '" onclick="wpopen(this.href); return false"';

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);
 }
 

trunk/wp-includes/cron.php

@@ -81 +81 @@
                 return;
 
-        $cron_url = get_settings( 'siteurl' ) . '/wp-cron.php';
+        $cron_url = get_option( 'siteurl' ) . '/wp-cron.php';
         $parts = parse_url( $cron_url );
 

trunk/wp-includes/deprecated.php

@@ -492 +492 @@
 }
 
+function get_settings($option) {
+        return get_option($option);
+}
+
 ?>

trunk/wp-includes/feed.php

@@ -88 +88 @@
         global $id;
 
-        if ('' != get_settings('permalink_structure'))
+        if ('' != get_option('permalink_structure'))
                 $url = trailingslashit( get_permalink() ) . 'feed/';
         else
-                $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&p=$id";
+                $url = get_option('home') . "/$commentsrssfilename?feed=rss2&p=$id";
 
         return apply_filters('post_comments_feed_link', $url);
@@ -98 +98 @@
 function get_author_rss_link($echo = false, $author_id, $author_nicename) {
        $auth_ID = $author_id;
-       $permalink_structure = get_settings('permalink_structure');
+       $permalink_structure = get_option('permalink_structure');
 
        if ('' == $permalink_structure) {
-                                 $link = get_settings('home') . '?feed=rss2&author=' . $author_id;
+                                 $link = get_option('home') . '?feed=rss2&author=' . $author_id;
        } else {
                                  $link = get_author_link(0, $author_id, $author_nicename);
@@ -114 +114 @@
 
 function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
-       $permalink_structure = get_settings('permalink_structure');
+       $permalink_structure = get_option('permalink_structure');
 
        if ('' == $permalink_structure) {
-                                 $link = get_settings('home') . '?feed=rss2&cat=' . $cat_ID;
+                                 $link = get_option('home') . '?feed=rss2&cat=' . $cat_ID;
        } else {
                                  $link = get_category_link($cat_ID);

trunk/wp-includes/formatting.php

@@ -607 +607 @@
         global $wp_smiliessearch, $wp_smiliesreplace;
     $output = '';
-        if (get_settings('use_smilies')) {
+        if (get_option('use_smilies')) {
                 // HTML loop taken from texturize function, could possible be consolidated
                 $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
@@ -657 +657 @@
   preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
   $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-  $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_settings('gmt_offset') * 3600);
+  $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_option('gmt_offset') * 3600);
   return $string_gmt;
 }
@@ -666 +666 @@
   preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
   $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-  $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_settings('gmt_offset')*3600);
+  $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_option('gmt_offset')*3600);
   return $string_localtime;
 }
@@ -691 +691 @@
       $offset = iso8601_timezone_to_offset($date_bits[7]);
     } else { // we don't have a timezone, so we assume user local timezone (not server's!)
-      $offset = 3600 * get_settings('gmt_offset');
+      $offset = 3600 * get_option('gmt_offset');
     }
     $timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);

trunk/wp-includes/functions.php

@@ -46 +46 @@
                 case 'mysql':
                         if ( $gmt ) $d = gmdate('Y-m-d H:i:s');
-                        else $d = gmdate('Y-m-d H:i:s', (time() + (get_settings('gmt_offset') * 3600)));
+                        else $d = gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * 3600)));
                         return $d;
                         break;
                 case 'timestamp':
                         if ( $gmt ) $d = time();
-                        else $d = time() + (get_settings('gmt_offset') * 3600);
+                        else $d = time() + (get_option('gmt_offset') * 3600);
                         return $d;
                         break;
@@ -89 +89 @@
         $i = 86400;
 
-        if ( $weekday < get_settings('start_of_week') )
-                $weekday = 7 - (get_settings('start_of_week') - $weekday);
-
-        while ($weekday > get_settings('start_of_week')) {
+        if ( $weekday < get_option('start_of_week') )
+                $weekday = 7 - (get_option('start_of_week') - $weekday);
+
+        while ($weekday > get_option('start_of_week')) {
                 $weekday = date('w',$day);
-                if ( $weekday < get_settings('start_of_week') )
-                        $weekday = 7 - (get_settings('start_of_week') - $weekday);
+                if ( $weekday < get_option('start_of_week') )
+                        $weekday = 7 - (get_option('start_of_week') - $weekday);
 
                 $day = $day - 86400;
@@ -108 +108 @@
 function get_lastpostdate($timezone = 'server') {
         global $cache_lastpostdate, $pagenow, $wpdb;
-        $add_seconds_blog = get_settings('gmt_offset') * 3600;
+        $add_seconds_blog = get_option('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         if ( !isset($cache_lastpostdate[$timezone]) ) {
@@ -131 +131 @@
 function get_lastpostmodified($timezone = 'server') {
         global $cache_lastpostmodified, $pagenow, $wpdb;
-        $add_seconds_blog = get_settings('gmt_offset') * 3600;
+        $add_seconds_blog = get_option('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         if ( !isset($cache_lastpostmodified[$timezone]) ) {
@@ -165 +165 @@
 /* Options functions */
 
-function get_settings($setting) {
+function get_option($setting) {
         global $wpdb;
 
@@ -187 +187 @@
         // If home is not set use siteurl.
         if ( 'home' == $setting && '' == $value )
-                return get_settings('siteurl');
+                return get_option('siteurl');
 
         if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
@@ -193 +193 @@
 
         return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
-}
-
-function get_option($option) {
-        return get_settings($option);
 }
 
@@ -291 +287 @@
 
 function gzip_compression() {
-        if ( !get_settings('gzipcompression') ) return false;
+        if ( !get_option('gzipcompression') ) return false;
 
         if ( extension_loaded('zlib') ) {
@@ -325 +321 @@
                 $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,8)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
+                $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_option('home') . $link_url : $link_url;
                 $links_summary .= "\n".$link_number.' '.$link_url;
         }
@@ -882 +878 @@
 // Returns an array containing the current upload directory's path and url, or an error message.
 function wp_upload_dir() {
-        $siteurl = get_settings('siteurl');
+        $siteurl = get_option('siteurl');
         //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
-        $path = str_replace(ABSPATH, '', trim(get_settings('upload_path')));
+        $path = str_replace(ABSPATH, '', trim(get_option('upload_path')));
         $dir = ABSPATH . $path;
         $url = trailingslashit($siteurl) . $path;
@@ -897 +893 @@
         }
 
-        if ( get_settings('uploads_use_yearmonth_folders')) {
+        if ( get_option('uploads_use_yearmonth_folders')) {
                 // Generate the yearly and monthly dirs
                 $time = current_time( 'mysql' );
@@ -1102 +1098 @@
         global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
 
-        $adminurl = get_settings('siteurl') . '/wp-admin';
+        $adminurl = get_option('siteurl') . '/wp-admin';
         if ( wp_get_referer() )
                 $adminurl = wp_get_referer();
@@ -1177 +1173 @@
 </head>
 <body>
-        <h1 id="logo"><img alt="WordPress" src="<?php echo get_settings('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
+        <h1 id="logo"><img alt="WordPress" src="<?php echo get_option('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
         <p><?php echo $message; ?></p>
 </body>

trunk/wp-includes/general-template.php

@@ -29 +29 @@
 function wp_loginout() {
         if ( ! is_user_logged_in() )
-                $link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
-        else
-                $link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
+                $link = '<a href="' . get_option('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
+        else
+                $link = '<a href="' . get_option('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
 
         echo apply_filters('loginout', $link);
@@ -40 +40 @@
 
         if ( ! is_user_logged_in() ) {
-                if ( get_settings('users_can_register') )
-                        $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
+                if ( get_option('users_can_register') )
+                        $link = $before . '<a href="' . get_option('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
                 else
                         $link = '';
         } else {
-                $link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
+                $link = $before . '<a href="' . get_option('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
         }
 
@@ -76 +76 @@
                 case 'home' :
                 case 'siteurl' :
-                        $output = get_settings('home');
+                        $output = get_option('home');
                         break;
                 case 'wpurl' :
-                        $output = get_settings('siteurl');
+                        $output = get_option('siteurl');
                         break;
                 case 'description':
-                        $output = get_settings('blogdescription');
+                        $output = get_option('blogdescription');
                         break;
                 case 'rdf_url':
@@ -100 +100 @@
                         break;
                 case 'pingback_url':
-                        $output = get_settings('siteurl') .'/xmlrpc.php';
+                        $output = get_option('siteurl') .'/xmlrpc.php';
                         break;
                 case 'stylesheet_url':
@@ -113 +113 @@
                         break;
                 case 'admin_email':
-                        $output = get_settings('admin_email');
+                        $output = get_option('admin_email');
                         break;
                 case 'charset':
-                        $output = get_settings('blog_charset');
+                        $output = get_option('blog_charset');
                         if ('' == $output) $output = 'UTF-8';
                         break;
@@ -128 +128 @@
                 case 'name':
                 default:
-                        $output = get_settings('blogname');
+                        $output = get_option('blogname');
                         break;
         }
@@ -310 +310 @@
 
         if ( !$archive_date_format_over_ride ) {
-                $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');
-        }
-
-        $add_hours = intval(get_settings('gmt_offset'));
-        $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
+                $archive_day_date_format = get_option('date_format');
+                $archive_week_start_date_format = get_option('date_format');
+                $archive_week_end_date_format = get_option('date_format');
+        }
+
+        $add_hours = intval(get_option('gmt_offset'));
+        $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
 
         if ( 'monthly' == $type ) {
@@ -359 +359 @@
                 }
         } elseif ( 'weekly' == $type ) {
-                $start_of_week = get_settings('start_of_week');
+                $start_of_week = get_option('start_of_week');
                 $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
                 $arc_w_last = '';
@@ -367 +367 @@
                                                 $arc_year = $arcresult->yr;
                                                 $arc_w_last = $arcresult->week;
-                                                $arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
+                                                $arc_week = get_weekstartend($arcresult->yyyymmdd, get_option('start_of_week'));
                                                 $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
                                                 $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
-                                                $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
+                                                $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_option('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
                                                 $text = $arc_week_start . $archive_week_separator . $arc_week_end;
                                                 echo get_archives_link($url, $text, $format, $before, $after);
@@ -417 +417 @@
 
         // week_begins = 0 stands for Sunday
-        $week_begins = intval(get_settings('start_of_week'));
-        $add_hours = intval(get_settings('gmt_offset'));
-        $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
+        $week_begins = intval(get_option('start_of_week'));
+        $add_hours = intval(get_option('gmt_offset'));
+        $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
 
         // Let's figure out when we are
@@ -438 +438 @@
                                 $thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
         } else {
-                $thisyear = gmdate('Y', current_time('timestamp') + get_settings('gmt_offset') * 3600);
-                $thismonth = gmdate('m', current_time('timestamp') + get_settings('gmt_offset') * 3600);
+                $thisyear = gmdate('Y', current_time('timestamp') + get_option('gmt_offset') * 3600);
+                $thismonth = gmdate('m', current_time('timestamp') + get_option('gmt_offset') * 3600);
         }
 
@@ -559 +559 @@
                 $newrow = false;
 
-                if ( $day == gmdate('j', (time() + (get_settings('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_settings('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_settings('gmt_offset') * 3600)) )
+                if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) )
                         echo '<td id="today">';
                 else
@@ -614 +614 @@
                 $the_date .= $before;
                 if ( $d=='' )
-                        $the_date .= mysql2date(get_settings('date_format'), $post->post_date);
+                        $the_date .= mysql2date(get_option('date_format'), $post->post_date);
                 else
                         $the_date .= mysql2date($d, $post->post_date);
@@ -635 +635 @@
 function get_the_modified_date($d = '') {
         if ( '' == $d )
-                $the_time = get_post_modified_time(get_settings('date_format'));
+                $the_time = get_post_modified_time(get_option('date_format'));
         else
                 $the_time = get_post_modified_time($d);
@@ -649 +649 @@
 function get_the_time( $d = '' ) {
         if ( '' == $d )
-                $the_time = get_post_time(get_settings('time_format'));
+                $the_time = get_post_time(get_option('time_format'));
         else
                 $the_time = get_post_time($d);
@@ -675 +675 @@
 function get_the_modified_time($d = '') {
         if ( '' == $d )
-                $the_time = get_post_modified_time(get_settings('time_format'));
+                $the_time = get_post_modified_time(get_option('time_format'));
         else
                 $the_time = get_post_modified_time($d);
@@ -742 +742 @@
  */
 function the_editor($content, $id = 'content', $prev_id = 'title') {
-        $rows = get_settings('default_post_edit_rows');
+        $rows = get_option('default_post_edit_rows');
         if (($rows < 3) || ($rows > 100))
                 $rows = 12;

trunk/wp-includes/js/tinymce/wp-mce-help.php

@@ -8 +8 @@
 <head>
 <title><?php _e('Rich Editor Help') ?></title>
-<link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 <style type="text/css">
         #wphead {

trunk/wp-includes/link-template.php

@@ -48 +48 @@
                 return get_attachment_link($post->ID);
 
-        $permalink = get_settings('permalink_structure');
+        $permalink = get_option('permalink_structure');
 
         if ( '' != $permalink && 'draft' != $post->post_status ) {
@@ -78 +78 @@
                         $post->post_name,
                 );
-                return apply_filters('post_link', get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
+                return apply_filters('post_link', get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
         } else { // if they're not using the fancy permalink option
-                $permalink = get_settings('home') . '/?p=' . $post->ID;
+                $permalink = get_option('home') . '/?p=' . $post->ID;
                 return apply_filters('post_link', $permalink, $post);
         }
@@ -101 +101 @@
                 $link = get_page_uri($id);
                 $link = str_replace('%pagename%', $link, $pagestruct);
-                $link = get_settings('home') . "/$link/";
-        } else {
-                $link = get_settings('home') . "/?page_id=$id";
+                $link = get_option('home') . "/$link/";
+        } else {
+                $link = get_option('home') . "/?page_id=$id";
         }
 
         if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
-                $link = get_settings('home');
+                $link = get_option('home');
 
         return apply_filters('page_link', $link, $id);
@@ -139 +139 @@
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
+                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
         $yearlink = $wp_rewrite->get_year_permastruct();
         if ( !empty($yearlink) ) {
                 $yearlink = str_replace('%year%', $year, $yearlink);
-                return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
-        } else {
-                return apply_filters('year_link', get_settings('home') . '/?m=' . $year, $year);
+                return apply_filters('year_link', get_option('home') . trailingslashit($yearlink), $year);
+        } else {
+                return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
         }
 }
@@ -152 +152 @@
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
+                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
         if ( !$month )
-                $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
+                $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
         $monthlink = $wp_rewrite->get_month_permastruct();
         if ( !empty($monthlink) ) {
                 $monthlink = str_replace('%year%', $year, $monthlink);
                 $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-                return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
-        } else {
-                return apply_filters('month_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
+                return apply_filters('month_link', get_option('home') . trailingslashit($monthlink), $year, $month);
+        } else {
+                return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
         }
 }
@@ -168 +168 @@
         global $wp_rewrite;
         if ( !$year )
-                $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
+                $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
         if ( !$month )
-                $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
+                $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
         if ( !$day )
-                $day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
+                $day = gmdate('j', time()+(get_option('gmt_offset') * 3600));
 
         $daylink = $wp_rewrite->get_day_permastruct();
@@ -179 +179 @@
                 $daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
                 $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-                return apply_filters('day_link', get_settings('home') . trailingslashit($daylink), $year, $month, $day);
-        } else {
-                return apply_filters('day_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
+                return apply_filters('day_link', get_option('home') . trailingslashit($daylink), $year, $month, $day);
+        } else {
+                return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
         }
 }
@@ -188 +188 @@
         global $wp_rewrite;
         $do_perma = 0;
-        $feed_url = get_settings('siteurl');
+        $feed_url = get_option('siteurl');
         $comment_feed_url = $feed_url;
 
@@ -203 +203 @@
                 $permalink = str_replace('%feed%', $feed, $permalink);
                 $permalink = preg_replace('#/+#', '/', "/$permalink/");
-                $output =  get_settings('home') . $permalink;
+                $output =  get_option('home') . $permalink;
         } else {
                 if ( false !== strpos($feed, 'comments_') )
                         $feed = str_replace('comments_', 'comments-', $feed);
 
-                $output = get_settings('home') . "/?feed={$feed}";
+                $output = get_option('home') . "/?feed={$feed}";
         }
 
@@ -230 +230 @@
         }
 
-        $location = get_settings('siteurl') . "/wp-admin/{$file}.php?action=edit&post=$post->ID";
+        $location = get_option('siteurl') . "/wp-admin/{$file}.php?action=edit&post=$post->ID";
         echo $before . "<a href=\"$location\">$link</a>" . $after;
 }
@@ -245 +245 @@
         }
 
-        $location = get_settings('siteurl') . "/wp-admin/comment.php?action=editcomment&amp;comment=$comment->comment_ID";
+        $location = get_option('siteurl') . "/wp-admin/comment.php?action=editcomment&amp;comment=$comment->comment_ID";
         echo $before . "<a href='$location'>$link</a>" . $after;
 }
@@ -363 +363 @@
         $permalink = 0;
 
-        $home_root = parse_url(get_settings('home'));
+        $home_root = parse_url(get_option('home'));
         $home_root = $home_root['path'];
         $home_root = trailingslashit($home_root);
@@ -391 +391 @@
                         $qstr .=        '&amp;' . $page_querystring . '=' . $pagenum;
                         // otherwise, it could be rewritten, OR just the default index ...
-                } elseif( '' != get_settings('permalink_structure') && ! is_admin() ) {
+                } elseif( '' != get_option('permalink_structure') && ! is_admin() ) {
                         $permalink = 1;
                         $index = $wp_rewrite->index;
@@ -413 +413 @@
         if ( $permalink )
                 $qstr = trailingslashit($qstr);
-        $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_settings('home') ) . $qstr );
+        $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_option('home') ) . $qstr );
 
         // showing /page/1/ or ?paged=1 is redundant

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);
 
 }

trunk/wp-includes/post-template.php

@@ -152 +152 @@
                                 $output .= ' ';
                                 if ( ($i != $page) || ((!$more) && ($page==1)) ) {
-                                        if ( '' == get_settings('permalink_structure') )
+                                        if ( '' == get_option('permalink_structure') )
                                                 $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
                                         else
@@ -167 +167 @@
                                 $i = $page - 1;
                                 if ( $i && $more ) {
-                                        if ( '' == get_settings('permalink_structure') )
+                                        if ( '' == get_option('permalink_structure') )
                                                 $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">'.$previouspagelink.'</a>';
                                         else
@@ -174 +174 @@
                                 $i = $page + 1;
                                 if ( $i <= $numpages && $more ) {
-                                        if ( '' == get_settings('permalink_structure') )
+                                        if ( '' == get_option('permalink_structure') )
                                                 $output .= '<a href="'.get_permalink() . '&amp;page=' . $i . '">'.$nextpagelink.'</a>';
                                         else
@@ -265 +265 @@
                 parse_str($args, $r);
 
-        $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_settings('date_format'),
+        $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_option('date_format'),
                 'child_of' => 0, 'title_li' => __('Pages'), 'echo' => 1);
         $r = array_merge($defaults, $r);
@@ -441 +441 @@
 
 function get_the_password_form() {
-        $output = '<form action="' . get_settings('siteurl') . '/wp-pass.php" method="post">
+        $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
         <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
         <p><label>' . __("Password:") . ' <input name="post_password" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . __("Submit") . '" /></p>

trunk/wp-includes/post.php

@@ -561 +561 @@
                         $comment_status = 'closed';
                 else
-                        $comment_status = get_settings('default_comment_status');
+                        $comment_status = get_option('default_comment_status');
         }
         if ( empty($ping_status) )
-                $ping_status = get_settings('default_ping_status');
+                $ping_status = get_option('default_ping_status');
         if ( empty($post_pingback) )
                 $post_pingback = get_option('default_pingback_flag');
@@ -1200 +1200 @@
                         $comment_status = 'closed';
                 else
-                        $comment_status = get_settings('default_comment_status');
+                        $comment_status = get_option('default_comment_status');
         }
         if ( empty($ping_status) )
-                $ping_status = get_settings('default_ping_status');
+                $ping_status = get_option('default_ping_status');
         if ( empty($post_pingback) )
                 $post_pingback = get_option('default_pingback_flag');

trunk/wp-includes/query.php

@@ -546 +546 @@
                 $post_type = $q['post_type'];
                 if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
-                        $q['posts_per_page'] = get_settings('posts_per_page');
+                        $q['posts_per_page'] = get_option('posts_per_page');
                 if ( !isset($q['what_to_show']) )
-                        $q['what_to_show'] = get_settings('what_to_show');
+                        $q['what_to_show'] = get_option('what_to_show');
                 if ( isset($q['showposts']) && $q['showposts'] ) {
                         $q['showposts'] = (int) $q['showposts'];
@@ -563 +563 @@
                 }
                 if ( $this->is_feed ) {
-                        $q['posts_per_page'] = get_settings('posts_per_rss');
+                        $q['posts_per_page'] = get_option('posts_per_rss');
                         $q['what_to_show'] = 'posts';
                 }
@@ -584 +584 @@
                 }
 
-                $add_hours = intval(get_settings('gmt_offset'));
-                $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
+                $add_hours = intval(get_option('gmt_offset'));
+                $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
                 $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
 

trunk/wp-includes/registration.php

@@ -110 +110 @@
         if ( !$update ) {
                 $user = new WP_User($user_id);
-                $user->set_role(get_settings('default_role'));
+                $user->set_role(get_option('default_role'));
         }
 

trunk/wp-includes/rewrite.php

@@ -90 +90 @@
 
         // Add 'www.' if it is absent and should be there
-        if ( false !== strpos(get_settings('home'), '://www.') && false === strpos($url, '://www.') )
+        if ( false !== strpos(get_option('home'), '://www.') && false === strpos($url, '://www.') )
                 $url = str_replace('://', '://www.', $url);
 
         // Strip 'www.' if it is present and shouldn't be
-        if ( false === strpos(get_settings('home'), '://www.') )
+        if ( false === strpos(get_option('home'), '://www.') )
                 $url = str_replace('://www.', '://', $url);
 
@@ -101 +101 @@
                 $url = str_replace('index.php/', '', $url);
 
-        if ( false !== strpos($url, get_settings('home')) ) {
+        if ( false !== strpos($url, get_option('home')) ) {
                 // Chop off http://domain.com
-                $url = str_replace(get_settings('home'), '', $url);
+                $url = str_replace(get_option('home'), '', $url);
         } else {
                 // Chop off /path/to/blog
-                $home_path = parse_url(get_settings('home'));
+                $home_path = parse_url(get_option('home'));
                 $home_path = $home_path['path'];
                 $url = str_replace($home_path, '', $url);
@@ -260 +260 @@
 
         function page_rewrite_rules() {
-                $uris = get_settings('page_uris');
-                $attachment_uris = get_settings('page_attachment_uris');
+                $uris = get_option('page_uris');
+                $attachment_uris = get_option('page_attachment_uris');
 
                 $rewrite_rules = array();
@@ -758 +758 @@
                 }
 
-                $site_root = parse_url(get_settings('siteurl'));
+                $site_root = parse_url(get_option('siteurl'));
                 $site_root = trailingslashit($site_root['path']);
 
-                $home_root = parse_url(get_settings('home'));
+                $home_root = parse_url(get_option('home'));
                 $home_root = trailingslashit($home_root['path']);
     
@@ -854 +854 @@
         function init() {
                 $this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
-                $this->permalink_structure = get_settings('permalink_structure');
+                $this->permalink_structure = get_option('permalink_structure');
                 $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
                 $this->root = '';
@@ -860 +860 @@
                         $this->root = $this->index . '/';
                 }
-                $this->category_base = get_settings('category_base');
+                $this->category_base = get_option('category_base');
                 unset($this->category_structure);
                 unset($this->author_structure);

trunk/wp-includes/script-loader.php

@@ -66 +66 @@
                                 if ( isset($this->args[$handle]) )
                                         $ver .= '&' . $this->args[$handle];
-                                $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_settings( 'siteurl' ) . $this->scripts[$handle]->src;
+                                $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src;
                                 echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n";
                                 $this->printed[] = $handle;

trunk/wp-includes/theme.php

@@ -5 +5 @@
 
 function get_stylesheet() {
-        return apply_filters('stylesheet', get_settings('stylesheet'));
+        return apply_filters('stylesheet', get_option('stylesheet'));
 }
 
@@ -27 +27 @@
 
 function get_template() {
-        return apply_filters('template', get_settings('template'));
+        return apply_filters('template', get_option('template'));
 }
 
@@ -238 +238 @@
         $themes = get_themes();
         $theme_names = array_keys($themes);
-        $current_template = get_settings('template');
-        $current_stylesheet = get_settings('stylesheet');
+        $current_template = get_option('template');
+        $current_stylesheet = get_option('stylesheet');
         $current_theme = 'WordPress Default';
 
@@ -260 +260 @@
 
 function get_theme_root_uri() {
-        return apply_filters('theme_root_uri', get_settings('siteurl') . "/wp-content/themes", get_settings('siteurl'));
+        return apply_filters('theme_root_uri', get_option('siteurl') . "/wp-content/themes", get_option('siteurl'));
 }
 

trunk/wp-includes/vars.php

@@ -90 +90 @@
         $wp_smiliessearch[] = $smiley;
         $smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
-        $wp_smiliesreplace[] = " <img src='" . get_settings('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
+        $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
 }
 

trunk/wp-links-opml.php

@@ -6 +6 @@
 }
 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 $link_cat = $_GET['link_cat'];
 if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) {

trunk/wp-login.php

@@ -17 +17 @@
 
         $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-        if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
+        if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
                 update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
 }
@@ -46 +46 @@
         <title>WordPress &raquo; <?php _e('Lost Password') ?></title>
         <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-        <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
+        <link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
         <script type="text/javascript">
         function focusit() {
@@ -81 +81 @@
 <ul>
         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_settings('users_can_register')) : ?>
+<?php if (get_option('users_can_register')) : ?>
         <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>
@@ -112 +112 @@
         $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
         $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
-        $message .= get_settings('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
-
-        $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_settings('blogname')), $message);
+        $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
+
+        $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message);
 
         if ($m == false) {
@@ -146 +146 @@
         $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
         $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-        $message .= get_settings('siteurl') . "/wp-login.php\r\n";
-
-        $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_settings('blogname')), $message);
+        $message .= get_option('siteurl') . "/wp-login.php\r\n";
+
+        $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message);
 
         if ($m == false) {
@@ -159 +159 @@
                 // send a copy of password change notification to the admin
                 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
-                wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_settings('blogname')), $message);
+                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
                 die();
         }
@@ -196 +196 @@
                 // If the user can't edit posts, send them to their profile.
                 if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
-                        $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
+                        $redirect_to = get_option('siteurl') . '/wp-admin/profile.php';
 
                 if ( wp_login($user_login, $user_pass, $using_cookie) ) {
@@ -247 +247 @@
 <ul>
         <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
-<?php if (get_settings('users_can_register')) : ?>
+<?php if (get_option('users_can_register')) : ?>
         <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
 <?php endif; ?>

trunk/wp-mail.php

@@ -6 +6 @@
 error_reporting(2037);
 
-$time_difference = get_settings('gmt_offset') * 3600;
+$time_difference = get_option('gmt_offset') * 3600;
 
 $phone_delim = '::';
@@ -12 +12 @@
 $pop3 = new POP3();
 
-if (!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port')))
+if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port')))
         wp_die($pop3->ERROR);
 
-$count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass'));
+$count = $pop3->login(get_option('mailserver_login'), get_option('mailserver_pass'));
 if (0 == $count) wp_die(__('There doesn’t seem to be any new mail.'));
 
@@ -103 +103 @@
         endforeach;
 
-        $subject = trim(str_replace(get_settings('subjectprefix'), '', $subject));
+        $subject = trim(str_replace(get_option('subjectprefix'), '', $subject));
 
         if ($content_type == 'multipart/alternative') {
@@ -127 +127 @@
         if ($post_title == '') $post_title = $subject;
 
-        if (empty($post_categories)) $post_categories[] = get_settings('default_email_category');
+        if (empty($post_categories)) $post_categories[] = get_option('default_email_category');
 
         $post_category = $post_categories;

trunk/wp-rdf.php

@@ -6 +6 @@
 }
 
-header('Content-type: application/rdf+xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 <rdf:RDF
@@ -46 +46 @@
         <dc:creator><?php the_author() ?></dc:creator>
         <?php the_category_rss('rdf') ?>
-<?php if (get_settings('rss_use_excerpt')) : ?>
+<?php if (get_option('rss_use_excerpt')) : ?>
         <description><?php the_excerpt_rss() ?></description>
 <?php else : ?>
-        <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
+        <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length'), 2) ?></description>
         <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
 <?php endif; ?>

trunk/wp-register.php

@@ -4 +4 @@
 
 $action = $_REQUEST['action'];
-if ( !get_settings('users_can_register') )
+if ( !get_option('users_can_register') )
         $action = 'disabled';
 
@@ -45 +45 @@
                 $user_id = wp_create_user( $user_login, $password, $user_email );
                 if ( !$user_id )
-                        $errors['user_id'] = sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_settings('admin_email'));
+                        $errors['user_id'] = sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email'));
                 else
                         wp_new_user_notification($user_id, $password);
@@ -57 +57 @@
 <head>
         <title>WordPress &raquo; <?php _e('Registration Complete') ?></title>
-        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
         <style type="text/css">
@@ -88 +88 @@
 <head>
         <title>WordPress &raquo; <?php _e('Registration Form') ?></title>
-        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
         <style type="text/css">
@@ -137 +137 @@
 <head>
         <title>WordPress &raquo; <?php _e('Registration Currently Disabled') ?></title>
-        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
+        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
         <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css">
 </head>
@@ -146 +146 @@
         <h2><?php _e('Registration Disabled') ?></h2>
         <p><?php _e('User registration is currently not allowed.') ?><br />
-        <a href="<?php echo get_settings('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
+        <a href="<?php echo get_option('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
         </p>
 </div>

trunk/wp-rss.php

@@ -6 +6 @@
 }
 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 <rss version="0.92">
@@ -25 +25 @@
         <item>
                 <title><?php the_title_rss() ?></title>
-<?php if (get_settings('rss_use_excerpt')) { ?>
+<?php if (get_option('rss_use_excerpt')) { ?>
                 <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php } else { // use content ?>
-                <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
+                <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length')) ?></description>
 <?php } ?>
                 <link><?php permalink_single_rss() ?></link>
                 <?php do_action('rss_item'); ?>
         </item>
-<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
+<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
 </channel>
 </rss>

trunk/wp-rss2.php

@@ -6 +6 @@
 }
 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 
 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" -->
@@ -38 +38 @@
 
                 <guid isPermaLink="false"><?php the_guid(); ?></guid>
-<?php if (get_settings('rss_use_excerpt')) : ?>
+<?php if (get_option('rss_use_excerpt')) : ?>
                 <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php else : ?>
@@ -52 +52 @@
         <?php do_action('rss2_item'); ?>
         </item>
-        <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && !is_date()) { break; } } } ?>
+        <?php $items_count++; if (($items_count == get_option('posts_per_rss')) && !is_date()) { break; } } } ?>
 </channel>
 </rss>

trunk/wp-settings.php

@@ -142 +142 @@
 if (!strstr($_SERVER['PHP_SELF'], 'install.php')) :
     // Used to guarantee unique hash cookies
-    $cookiehash = md5(get_settings('siteurl')); // Remove in 1.4
+    $cookiehash = md5(get_option('siteurl')); // Remove in 1.4
         define('COOKIEHASH', $cookiehash); 
 endif;
@@ -151 +151 @@
         define('PASS_COOKIE', 'wordpresspass_'. COOKIEHASH);
 if ( !defined('COOKIEPATH') )
-        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
+        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
 if ( !defined('SITECOOKIEPATH') )
-        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) );
+        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
 if ( !defined('COOKIE_DOMAIN') )
         define('COOKIE_DOMAIN', false);
@@ -160 +160 @@
 
 // Check for hacks file if the option is enabled
-if (get_settings('hack_file')) {
+if (get_option('hack_file')) {
         if (file_exists(ABSPATH . '/my-hacks.php'))
                 require(ABSPATH . '/my-hacks.php');
 }
 
-if ( get_settings('active_plugins') ) {
-        $current_plugins = get_settings('active_plugins');
+if ( get_option('active_plugins') ) {
+        $current_plugins = get_option('active_plugins');
         if ( is_array($current_plugins) ) {
                 foreach ($current_plugins as $plugin) {

trunk/wp-trackback.php

@@ -43 +43 @@
 
 if ( function_exists('mb_convert_encoding') ) { // For international trackbacks
-        $title     = mb_convert_encoding($title, get_settings('blog_charset'), $charset);
-        $excerpt   = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset);
-        $blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset);
+        $title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
+        $excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
+        $blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
 }
 
@@ -71 +71 @@
         $excerpt = strip_tags($excerpt);
         if ( function_exists('mb_strcut') ) { // For international trackbacks
-                $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
-                $title = mb_strcut($title, 0, 250, get_settings('blog_charset')) . '...';
+                $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...';
+                $title = mb_strcut($title, 0, 250, get_option('blog_charset')) . '...';
         } else {
                 $excerpt = (strlen($excerpt) > 255) ? substr($excerpt, 0, 252) . '...' : $excerpt;

trunk/xmlrpc.php

@@ -13 +13 @@
 
 if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
   <service>
@@ -191 +191 @@
           $struct = array(
             'isAdmin'  => $is_admin,
-            'url'      => get_settings('home') . '/',
+            'url'      => get_option('home') . '/',
             'blogid'   => '1',
-            'blogName' => get_settings('blogname')
+            'blogName' => get_option('blogname')
           );
 
@@ -330 +330 @@
 
           /* warning: here we make the assumption that the weblog's URL is on the same server */
-          $filename = get_settings('home') . '/';
+          $filename = get_option('home') . '/';
           $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
@@ -365 +365 @@
 
           /* warning: here we make the assumption that the weblog's URL is on the same server */
-          $filename = get_settings('home') . '/';
+          $filename = get_option('home') . '/';
           $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
@@ -545 +545 @@
 
           $comment_status = (empty($content_struct['mt_allow_comments'])) ?
-            get_settings('default_comment_status')
+            get_option('default_comment_status')
             : $content_struct['mt_allow_comments'];
 
           $ping_status = (empty($content_struct['mt_allow_pings'])) ?
-            get_settings('default_ping_status')
+            get_option('default_ping_status')
             : $content_struct['mt_allow_pings'];
 
@@ -642 +642 @@
 
           $comment_status = (empty($content_struct['mt_allow_comments'])) ?
-            get_settings('default_comment_status')
+            get_option('default_comment_status')
             : $content_struct['mt_allow_comments'];
 
           $ping_status = (empty($content_struct['mt_allow_pings'])) ?
-            get_settings('default_ping_status')
+            get_option('default_ping_status')
             : $content_struct['mt_allow_pings'];
 
@@ -1112 +1112 @@
 
                 // Check if the page linked to is in our site
-                $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home')));
+                $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
                 if( !$pos1 )
                         return new IXR_Error(0, 'Is there no link to us?');