WordPress.org
Get WordPress

Make WordPress Core

Changeset 4144


Ignore:
Timestamp:
08/30/2006 09:46:31 PM (18 years ago)
Author:
ryan
Message:

Use get_option instead of get_settings. Just 'cause.

Location:
trunk
Files:
70 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-functions.php

    r4118 r4144  
    336336
    337337    $post->post_status = 'draft';
    338     $post->comment_status = get_settings('default_comment_status');
    339     $post->ping_status = get_settings('default_ping_status');
    340     $post->post_pingback = get_settings('default_pingback_flag');
    341     $post->post_category = get_settings('default_category');
     338    $post->comment_status = get_option('default_comment_status');
     339    $post->ping_status = get_option('default_ping_status');
     340    $post->post_pingback = get_option('default_pingback_flag');
     341    $post->post_category = get_option('default_category');
    342342    $post->post_content = apply_filters('default_content', $post_content);
    343343    $post->post_title = apply_filters('default_title', $post_title);
    … …  
    11071107    echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
    11081108
    1109     $time_adj = time() + (get_settings('gmt_offset') * 3600);
     1109    $time_adj = time() + (get_option('gmt_offset') * 3600);
    11101110    $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
    11111111    $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
    … …  
    16241624
    16251625function get_home_path() {
    1626     $home = get_settings('home');
    1627     if ($home != '' && $home != get_settings('siteurl')) {
     1626    $home = get_option('home');
     1627    if ($home != '' && $home != get_option('siteurl')) {
    16281628        $home_path = parse_url($home);
    16291629        $home_path = $home_path['path'];

  • trunk/wp-admin/admin-header.php

    r4120 r4144  
    1616<html xmlns="http://www.w3.org/1999/xhtml">
    1717<head>
    18 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     18<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    1919<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
    20 <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
     20<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
    2121<script type="text/javascript">
    2222//<![CDATA[
    … …  
    4242<body>
    4343<div id="wphead">
    44 <h1><?php echo wptexturize(get_settings(('blogname'))); ?> <span>(<a href="<?php echo get_settings('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
     44<h1><?php echo wptexturize(get_option(('blogname'))); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
    4545</div>
    46 <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>
     46<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>
    4747
    4848<?php

  • trunk/wp-admin/admin.php

    r4110 r4144  
    2020wp_get_current_user();
    2121
    22 $posts_per_page = get_settings('posts_per_page');
    23 $what_to_show = get_settings('what_to_show');
    24 $date_format = get_settings('date_format');
    25 $time_format = get_settings('time_format');
     22$posts_per_page = get_option('posts_per_page');
     23$what_to_show = get_option('what_to_show');
     24$date_format = get_option('date_format');
     25$time_format = get_option('time_format');
    2626
    2727wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));

  • trunk/wp-admin/bookmarklet.php

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

  • trunk/wp-admin/comment.php

    r3985 r4144  
    6363    echo "<p>" . __('Are you sure you want to do that?') . "</p>\n";
    6464
    65     echo "<form action='".get_settings('siteurl')."/wp-admin/comment.php' method='get'>\n";
     65    echo "<form action='".get_option('siteurl')."/wp-admin/comment.php' method='get'>\n";
    6666    wp_nonce_field($nonce_action);
    6767    echo "<input type='hidden' name='action' value='$formaction' />\n";
    … …  
    7373    echo "<input type='submit' value='" . __('Yes') . "' />";
    7474    echo "&nbsp;&nbsp;";
    75     echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit-comments.php';\" />\n";
     75    echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_option('siteurl') ."/wp-admin/edit-comments.php';\" />\n";
    7676    echo "</form>\n";
    7777    echo "</div>\n";
    … …  
    107107        wp_redirect(wp_get_referer());
    108108    } else {
    109         wp_redirect(get_settings('siteurl') .'/wp-admin/edit-comments.php');
     109        wp_redirect(get_option('siteurl') .'/wp-admin/edit-comments.php');
    110110    }
    111111    exit();
    … …  
    134134        wp_redirect(wp_get_referer());
    135135    } else {
    136         wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
     136        wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
    137137    }
    138138    exit();
    … …  
    157157
    158158    wp_set_comment_status($comment->comment_ID, "approve");
    159     if (get_settings("comments_notify") == true) {
     159    if (get_option("comments_notify") == true) {
    160160        wp_notify_postauthor($comment->comment_ID);
    161161    }
    … …  
    165165        wp_redirect(wp_get_referer());
    166166    } else {
    167         wp_redirect(get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
     167        wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
    168168    }
    169169    exit();

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

    r4125 r4144  
    7676<div class="dbx-content">
    7777<p id="jaxcat"></p>
    78 <ul id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></ul></div>
     78<ul id="categorychecklist"><?php dropdown_categories(get_option('default_category')); ?></ul></div>
    7979</fieldset>
    8080

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

    r4133 r4144  
    3535<?php the_quicktags(); ?>
    3636<?php
    37  $rows = get_settings('default_post_edit_rows');
     37 $rows = get_option('default_post_edit_rows');
    3838 if (($rows < 3) || ($rows > 100)) {
    3939     $rows = 10;

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

    r3999 r4144  
    4444<div class="dbx-content">
    4545<p id="jaxcat"></p>
    46 <ul id="categorychecklist"><?php dropdown_link_categories(get_settings('default_link_category')); ?></ul>
     46<ul id="categorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
    4747</div>
    4848</fieldset>

  • trunk/wp-admin/export.php

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

  • trunk/wp-admin/import/blogger.php

    r3985 r4144  
    602602            header('Content-Type: text/html; charset=utf-8');
    603603
    604             $this->import = get_settings('import-blogger');
     604            $this->import = get_option('import-blogger');
    605605
    606606            if ( false === $this->import ) {

  • trunk/wp-admin/inline-uploading.php

    r3985 r4144  
    284284<html xmlns="http://www.w3.org/1999/xhtml">
    285285<head>
    286 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     286<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    287287<title></title>
    288288<meta http-equiv="imagetoolbar" content="no" />

  • trunk/wp-admin/link-add.php

    r3999 r4144  
    2828
    2929<div class="wrap">
    30 <?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();") ?>
     30<?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();") ?>
    3131</div>
    3232

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

    r4109 r4144  
    22require_once('admin.php');
    33cache_javascript_headers();
    4 $handler =  get_settings( 'siteurl' ) . '/wp-admin/admin-ajax.php';
     4$handler =  get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php';
    55?>
    66addLoadEvent(function(){theList=new listMan();});

  • trunk/wp-admin/menu-header.php

    r3536 r4144  
    1414    if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
    1515        if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
    16             echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
     16            echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    1717        else
    18             echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
     18            echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
    1919    }
    2020}
    … …  
    4343if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
    4444    if ( 'admin.php' == $pagenow )
    45         echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
     45        echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
    4646    else
    47         echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
     47        echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
    4848 } else {
    49     echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
     49    echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
    5050 }
    5151endforeach;

  • trunk/wp-admin/moderation.php

    r4005 r4144  
    4848            case 'approve':
    4949                wp_set_comment_status($key, 'approve');
    50                 if ( get_settings('comments_notify') == true ) {
     50                if ( get_option('comments_notify') == true ) {
    5151                    wp_notify_postauthor($key);
    5252                }
    … …  
    126126    foreach($comments as $comment) {
    127127    ++$i;
    128     $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date);
     128    $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
    129129    $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'");
    130130    if ($i % 2) $class = 'js-unapproved alternate';

  • trunk/wp-admin/options-discussion.php

    r4133 r4144  
    2828<li>
    2929<label for="default_pingback_flag">
    30 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> />
     30<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
    3131<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label>
    3232</li>
    3333<li>
    3434<label for="default_ping_status">
    35 <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> />
     35<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
    3636<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label>
    3737</li>
    3838<li>
    3939<label for="default_comment_status">
    40 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_settings('default_comment_status')); ?> />
     40<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
    4141<?php _e('Allow people to post comments on the article') ?></label>
    4242</li>
    … …  
    4848<li>
    4949<label for="comments_notify">
    50 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> />
     50<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
    5151<?php _e('Anyone posts a comment') ?> </label>
    5252</li>
    5353<li>
    5454<label for="moderation_notify">
    55 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> />
     55<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
    5656<?php _e('A comment is held for moderation') ?> </label>
    5757</li>
    … …  
    6363<li>
    6464<label for="comment_moderation">
    65 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> />
     65<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
    6666<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label>
    6767</li>
    68 <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>
    69 <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>
     68<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>
     69<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>
    7070</ul>
    7171</fieldset>
    7272<fieldset class="options">
    7373<legend><?php _e('Comment Moderation') ?></legend>
    74 <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>
     74<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>
    7575
    7676<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>
    … …  
    8989</p>
    9090<p><label for="open_proxy_check">
    91 <input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> />
     91<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_option('open_proxy_check')); ?> />
    9292<?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
    9393</fieldset>

  • trunk/wp-admin/options-general.php

    r4133 r4144  
    4040<th scope="row"><?php _e('Membership:') ?></th>
    4141<td> <label for="users_can_register">
    42 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> />
     42<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
    4343<?php _e('Anyone can register') ?></label><br />
    4444<label for="comment_registration">
    45 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> />
     45<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
    4646<?php _e('Users must be registered and logged in to comment') ?>
    4747</label>
    … …  
    5151<th scope="row"><?php _e('New User Default Role:') ?></th>
    5252<td><label for="default_role">
    53 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_settings('default_role') ); ?></select></label>
     53<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
    5454</td>
    5555</tr>
    … …  
    7070<th scope="row"><?php _e('Default date format:') ?></th>
    7171<td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
    72 <?php _e('Output:') ?> <strong><?php echo mysql2date(get_settings('date_format'), current_time('mysql')); ?></strong></td>
     72<?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
    7373</tr>
    7474<tr>
    7575<th scope="row"><?php _e('Default time format:') ?></th>
    7676<td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
    77 <?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
     77<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
    7878</tr>
    7979<tr>
    … …  
    8686<?php
    8787for ($day_index = 0; $day_index <= 6; $day_index++) :
    88     $selected = (get_settings('start_of_week') == $day_index) ? 'selected="selected"' : '';
     88    $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
    8989    echo "\n\t<option value='$day_index' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
    9090endfor;

  • trunk/wp-admin/options-misc.php

    r4112 r4144  
    1818<tr valign="top">
    1919<th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
    20 <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" />
     20<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" />
    2121<br />
    2222<?php _e('Default is <code>wp-content/uploads</code>'); ?>
    … …  
    2727<td>
    2828<label for="uploads_use_yearmonth_folders">
    29 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_settings('uploads_use_yearmonth_folders')); ?> />
     29<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
    3030<?php _e('Organize my uploads into month- and year-based folders'); ?>
    3131</label>
    … …  
    3535</fieldset>
    3636
    37 <p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_settings('use_linksupdate')); ?> />
     37<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
    3838<label for="use_linksupdate"><?php _e('Track Bookmarks&#8217; Update Times') ?></label></p>
    3939<p>
    40 <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>
     40<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>
    4141</p>
    4242

  • trunk/wp-admin/options-permalink.php

    r4133 r4144  
    7676}
    7777
    78 $permalink_structure = get_settings('permalink_structure');
    79 $category_base = get_settings('category_base');
     78$permalink_structure = get_option('permalink_structure');
     79$category_base = get_option('category_base');
    8080
    8181if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
    … …  
    123123    <label>
    124124<input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> />
    125 <?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
     125<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_option('home'); ?>/?p=123</code></span>
    126126   </label>
    127127</p>
    … …  
    129129    <label>
    130130<input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />
    131 <?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>
     131<?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>
    132132   </label>
    133133</p>
    … …  
    135135    <label>
    136136<input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />
    137 <?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
     137<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></span>
    138138   </label>
    139139</p>

  • trunk/wp-admin/options-reading.php

    r3852 r4144  
    5555<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" />
    5656<select name="what_to_show" id="what_to_show" >
    57 <option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option>
    58 <option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option>
     57<option value="days" <?php selected('days', get_option('what_to_show')); ?>><?php _e('days') ?></option>
     58<option value="posts" <?php selected('posts', get_option('what_to_show')); ?>><?php _e('posts') ?></option>
    5959</select>
    6060</td>
    … …  
    7373<th scope="row"><?php _e('For each article, show:') ?> </th>
    7474<td>
    75 <label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>  /> <?php _e('Full text') ?></label><br />
    76 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
     75<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>    /> <?php _e('Full text') ?></label><br />
     76<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
    7777</td>
    7878</tr>
    … …  
    8787</table>
    8888<p>
    89 <label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> />
     89<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_option('gzipcompression')); ?> />
    9090<?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
    9191</p>

  • trunk/wp-admin/options-writing.php

    r4133 r4144  
    2222<td>
    2323<label for="rich_editing">
    24 <input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_settings('rich_editing')); ?> />
     24<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_option('rich_editing')); ?> />
    2525<?php _e('Users should use the visual rich editor by default') ?></label><br />
    2626<label for="use_smilies">
    27 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> />
     27<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
    2828<?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
    29 <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>
     29<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>
    3030</td>
    3131</tr>
    … …  
    3636$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_name");
    3737foreach ($categories as $category) :
    38 if ($category->cat_ID == get_settings('default_category')) $selected = " selected='selected'";
     38if ($category->cat_ID == get_option('default_category')) $selected = " selected='selected'";
    3939else $selected = '';
    4040echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
    … …  
    4848<?php
    4949foreach ($categories as $category) :
    50 if ($category->cat_ID == get_settings('default_link_category')) $selected = " selected='selected'";
     50if ($category->cat_ID == get_option('default_link_category')) $selected = " selected='selected'";
    5151else $selected = '';
    5252echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";
    … …  
    8585//Alreay have $categories from default_category
    8686foreach ($categories as $category) :
    87 if ($category->cat_ID == get_settings('default_email_category')) $selected = " selected='selected'";
     87if ($category->cat_ID == get_option('default_email_category')) $selected = " selected='selected'";
    8888else $selected = '';
    8989echo "\n\t<option value='$category->cat_ID' $selected>$category->cat_name</option>";

  • trunk/wp-admin/options.php

    r4112 r4144  
    8888
    8989    // Save for later.
    90     $old_siteurl = get_settings('siteurl');
    91     $old_home = get_settings('home');
     90    $old_siteurl = get_option('siteurl');
     91    $old_home = get_option('home');
    9292
    9393    if ($options) {
    … …  
    105105    if ($any_changed) {
    106106            // If siteurl or home changed, reset cookies.
    107             if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
     107            if ( get_option('siteurl') != $old_siteurl || get_option('home') != $old_home ) {
    108108                // If home changed, write rewrite rules to new location.
    109109                $wp_rewrite->flush_rules();
    … …  
    111111                wp_clearcookie();
    112112                // Set cookies for new paths.
    113                 wp_setcookie($user_login, $user_pass_md5, true, get_settings('home'), get_settings('siteurl'));
     113                wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl'));
    114114            }
    115115

  • trunk/wp-admin/page.php

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

  • trunk/wp-admin/plugins.php

    r3928 r4144  
    55    if ('activate' == $_GET['action']) {
    66        check_admin_referer('activate-plugin_' . $_GET['plugin']);
    7         $current = get_settings('active_plugins');
     7        $current = get_option('active_plugins');
    88        if (!in_array($_GET['plugin'], $current)) {
    99            $current[] = trim( $_GET['plugin'] );
    … …  
    1616    } else if ('deactivate' == $_GET['action']) {
    1717        check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
    18         $current = get_settings('active_plugins');
     18        $current = get_option('active_plugins');
    1919        array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
    2020        update_option('active_plugins', $current);
    … …  
    3131// If any plugins don't exist, axe 'em
    3232
    33 $check_plugins = get_settings('active_plugins');
     33$check_plugins = get_option('active_plugins');
    3434
    3535// Sanity check.  If the active plugin list is not an array, make it an
    … …  
    4444foreach ($check_plugins as $check_plugin) {
    4545    if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
    46             $current = get_settings('active_plugins');
     46            $current = get_option('active_plugins');
    4747            $key = array_search($check_plugin, $current);
    4848            if ( false !== $key && NULL !== $key ) {
    … …  
    6868<?php
    6969
    70 if ( get_settings('active_plugins') )
    71     $current_plugins = get_settings('active_plugins');
     70if ( get_option('active_plugins') )
     71    $current_plugins = get_option('active_plugins');
    7272
    7373$plugins = get_plugins();

  • trunk/wp-admin/post-new.php

    r4082 r4144  
    1212<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 />
    1313You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
    14 When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
     14When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_option('admin_email')); ?>
    1515</p>
    1616</div>
    … …  
    6363if ($is_NS4 || $is_gecko) {
    6464?>
    65 <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>
     65<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>
    6666<?php
    6767} else if ($is_winIE) {
    6868?>
    69 <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>
     69<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>
    7070<script type="text/javascript">
    7171<!--
    … …  
    8282} else if ($is_opera) {
    8383?>
    84 <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>
     84<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>
    8585<?php
    8686} else if ($is_macIE) {
    8787?>
    88 <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>
     88<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>
    8989<?php
    9090}

  • trunk/wp-admin/post.php

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

  • trunk/wp-admin/update-links.php

    r4006 r4144  
    1717$http_request  = "POST /updated-batch/ HTTP/1.0\r\n";
    1818$http_request .= "Host: api.pingomatic.com\r\n";
    19 $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
     19$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_option('blog_charset')."\r\n";
    2020$http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
    2121$http_request .= 'User-Agent: WordPress/' . $wp_version . "\r\n";

  • trunk/wp-admin/users.php

    r4136 r4144  
    437437<div class="wrap">
    438438<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
    439 <?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>'; ?>
     439<?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>'; ?>
    440440<form action="#add-new-user" method="post" name="adduser" id="adduser">
    441441<?php wp_nonce_field('add-user') ?>
    … …  
    476476            <?php
    477477            if ( !$new_user_role )
    478                 $new_user_role = get_settings('default_role');
     478                $new_user_role = get_option('default_role');
    479479            wp_dropdown_roles($new_user_role);
    480480            ?>

  • trunk/wp-atom.php

    r2627 r4144  
    66}
    77
    8 header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
     8header('Content-type: application/atom+xml; charset=' . get_option('blog_charset'), true);
    99$more = 1;
    1010
    1111?>
    12 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
     12<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
    1313<feed version="0.3"
    1414  xmlns="http://purl.org/atom/ns#"
    … …  
    3636        <?php the_category_rss('rdf') ?>
    3737        <summary type="text/plain" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
    38 <?php if ( !get_settings('rss_use_excerpt') ) : ?>
     38<?php if ( !get_option('rss_use_excerpt') ) : ?>
    3939        <content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
    4040<?php endif; ?>
    … …  
    4242<?php do_action('atom_entry'); ?>
    4343    </entry>
    44     <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
     44    <?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
    4545</feed>

  • trunk/wp-comments-post.php

    r3984 r4144  
    3737$comment_type = '';
    3838
    39 if ( get_settings('require_name_email') && !$user->ID ) {
     39if ( get_option('require_name_email') && !$user->ID ) {
    4040    if ( 6 > strlen($comment_author_email) || '' == $comment_author )
    4141        wp_die( __('Error: please fill the required fields (name, email).') );

  • trunk/wp-commentsrss2.php

    r3644 r4144  
    66}
    77
    8 header('Content-type: text/xml;charset=' . get_settings('blog_charset'), true);
     8header('Content-type: text/xml;charset=' . get_option('blog_charset'), true);
    99
    10 echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>';
     10echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
    1111?>
    1212<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    … …  
    3535            AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish'
    3636            AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "'
    37             ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
     37            ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
    3838        } else { // if no post id passed in, we'll just ue the last 10 comments.
    3939            $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email,
    … …  
    4242            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish'
    4343            AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "' 
    44             ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss') );
     44            ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
    4545        }
    4646    // this line is WordPress' motor, do not delete it.

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

    r4095 r4144  
    164164
    165165        $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
    166         $download_uri = get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$backup_filename}";
     166        $download_uri = get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$backup_filename}";
    167167        switch($_POST['deliver']) {
    168168        case 'http':
    … …  
    316316            } elseif ('http' == $_POST['deliver']) {
    317317                $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
    318                 header('Refresh: 3; ' . get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$this->backup_file}");
     318                header('Refresh: 3; ' . get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}&backup={$this->backup_file}");
    319319            }
    320320            // we do this to say we're done.
    … …  
    620620                $msg = sprintf(__('File not found:%s'), "<br /><strong>$filename</strong><br />");
    621621                $this_basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__);
    622                 $msg .= '<br /><a href="' . get_settings('siteurl') . "/wp-admin/edit.php?page={$this_basename}" . '">' . __('Return to Backup');
     622                $msg .= '<br /><a href="' . get_option('siteurl') . "/wp-admin/edit.php?page={$this_basename}" . '">' . __('Return to Backup');
    623623            die($msg);
    624624            }
    … …  
    633633
    634634            if (! is_email ($recipient)) {
    635                 $recipient = get_settings('admin_email');
     635                $recipient = get_option('admin_email');
    636636            }
    637637            $randomish = md5(time());
    … …  
    643643            $headers = "MIME-Version: 1.0\n";
    644644            $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\n";
    645             $headers .= 'From: ' . get_settings('admin_email') . "\n";
     645            $headers .= 'From: ' . get_option('admin_email') . "\n";
    646646
    647647            $message = sprintf(__("Attached to this email is\n   %1s\n   Size:%2s kilobytes\n"), $filename, round(filesize($diskfile)/1024));
    … …  
    686686            switch($_POST['deliver']) {
    687687            case 'http':
    688                 $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);
     688                $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);
    689689                break;
    690690            case 'smtp':
    691691                if (! is_email($_POST['backup_recipient'])) {
    692                     $feedback .= get_settings('admin_email');
     692                    $feedback .= get_option('admin_email');
    693693                } else {
    694694                    $feedback .= $_POST['backup_recipient'];
    … …  
    698698            case 'none':
    699699                $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"');
    700                 $feedback .= ':<br /> <a href="' . get_settings('siteurl') . "/{$this->backup_dir}$file\">$file</a> : " . sprintf(__('%s bytes'), filesize(ABSPATH . $this->backup_dir . $file));
     700                $feedback .= ':<br /> <a href="' . get_option('siteurl') . "/{$this->backup_dir}$file\">$file</a> : " . sprintf(__('%s bytes'), filesize(ABSPATH . $this->backup_dir . $file));
    701701            }
    702702            $feedback .= '</p></div>';
    … …  
    782782        echo '<label style="display:block;"><input type="radio" checked="checked" name="deliver" value="http" /> ' . __('Download to your computer') . '</label>';
    783783        echo '<div><input type="radio" name="deliver" id="do_email" value="smtp" /> ';
    784         echo '<label for="do_email">'.__('Email backup to:').'</label><input type="text" name="backup_recipient" size="20" value="' . get_settings('admin_email') . '" />';
     784        echo '<label for="do_email">'.__('Email backup to:').'</label><input type="text" name="backup_recipient" size="20" value="' . get_option('admin_email') . '" />';
    785785
    786786        // Check DB dize.
    … …  
    810810        if (function_exists('wp_cron_init')) {
    811811            echo '<fieldset class="options"><legend>' . __('Scheduled Backup') . '</legend>';
    812             $datetime = get_settings('date_format') . ' @ ' . get_settings('time_format');
     812            $datetime = get_option('date_format') . ' @ ' . get_option('time_format');
    813813            echo '<p>' . __('Last WP-Cron Daily Execution') . ': ' . date($datetime, get_option('wp_cron_daily_lastrun')) . '<br />';
    814814            echo __('Next WP-Cron Daily Execution') . ': ' . date($datetime, (get_option('wp_cron_daily_lastrun') + 86400)) . '</p>';
    … …  
    829829            $cron_recipient = get_option('wp_cron_backup_recipient');
    830830            if (! is_email($cron_recipient)) {
    831                 $cron_recipient = get_settings('admin_email');
     831                $cron_recipient = get_option('admin_email');
    832832            }
    833833            echo __('Email backup to:') . ' <input type="text" name="cron_backup_recipient" size="20" value="' . $cron_recipient . '" />';

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

    r4133 r4144  
    77<html xmlns="http://www.w3.org/1999/xhtml">
    88<head>
    9      <title><?php echo get_settings('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
     9     <title><?php echo get_option('blogname'); ?> - <?php echo sprintf(__("Comments on %s"), the_title('','',false)); ?></title>
    1010
    11     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     11    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    1212    <style type="text/css" media="screen">
    1313        @import url( <?php bloginfo('stylesheet_url'); ?> );
    … …  
    1818<body id="commentspopup">
    1919
    20 <h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
     20<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
    2121
    2222<h2 id="comments"><?php _e("Comments"); ?></h2>
    2323
    24 <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>
     24<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>
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    … …  
    5656<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>
    5757
    58 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
     58<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
    5959    <p>
    6060      <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

    r4133 r4144  
    77<html xmlns="http://www.w3.org/1999/xhtml">
    88<head>
    9      <title><?php echo get_settings('blogname'); ?> - Comments on <?php the_title(); ?></title>
     9     <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
    1010
    11     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     11    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    1212    <style type="text/css" media="screen">
    1313        @import url( <?php bloginfo('stylesheet_url'); ?> );
    … …  
    1818<body id="commentspopup">
    1919
    20 <h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1>
     20<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
    2121
    2222<h2 id="comments">Comments</h2>
    2323
    24 <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>
     24<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>
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    … …  
    5656<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>
    5757
    58 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
     58<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
    5959    <p>
    6060      <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

    r3998 r4144  
    2222
    2323function kubrick_header_image() {
    24     return apply_filters('kubrick_header_image', get_settings('kubrick_header_image'));
     24    return apply_filters('kubrick_header_image', get_option('kubrick_header_image'));
    2525}
    2626
    … …  
    5151
    5252function kubrick_header_color() {
    53     return apply_filters('kubrick_header_color', get_settings('kubrick_header_color'));
     53    return apply_filters('kubrick_header_color', get_option('kubrick_header_color'));
    5454}
    5555
    … …  
    6363
    6464function kubrick_header_display() {
    65     return apply_filters('kubrick_header_display', get_settings('kubrick_header_display'));
     65    return apply_filters('kubrick_header_display', get_option('kubrick_header_display'));
    6666}
    6767
    … …  
    9494
    9595                    if ( isset($_REQUEST['toggledisplay']) ) {
    96                         if ( false === get_settings('kubrick_header_display') )
     96                        if ( false === get_option('kubrick_header_display') )
    9797                            update_option('kubrick_header_display', 'none');
    9898                        else

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

    r3924 r4144  
    3434<div id="header">
    3535    <div id="headerimg">
    36         <h1><a href="<?php echo get_settings('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
     36        <h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
    3737        <div class="description"><?php bloginfo('description'); ?></div>
    3838    </div>

  • trunk/wp-includes/author-template.php

    r4140 r4144  
    175175
    176176    if ( empty($link) ) {
    177         $file = get_settings('home') . '/';
     177        $file = get_option('home') . '/';
    178178        $link = $file . '?author=' . $auth_ID;
    179179    } else {
    … …  
    184184        }
    185185        $link = str_replace('%author%', $author_nicename, $link);
    186         $link = get_settings('home') . trailingslashit($link);
     186        $link = get_option('home') . trailingslashit($link);
    187187    }
    188188

  • trunk/wp-includes/bookmark-template.php

    r4108 r4144  
    9494        $output .= $before;
    9595        if ( $show_updated && $row->recently_updated )
    96             $output .= get_settings('links_recently_updated_prepend');
     96            $output .= get_option('links_recently_updated_prepend');
    9797        $the_link = '#';
    9898        if ( !empty($row->link_url) )
    … …  
    108108        if ( $show_updated )
    109109            if (substr($row->link_updated_f, 0, 2) != '00')
    110                 $title .= ' (Last updated ' . date(get_settings('links_updated_date_format'), $row->link_updated_f + (get_settings('gmt_offset') * 3600)) . ')';
     110                $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
    111111
    112112        if ( '' != $title )
    … …  
    125125                $output .= "<img src=\"$row->link_image\" $alt $title />";
    126126            else // If it's a relative path
    127                 $output .= "<img src=\"" . get_settings('siteurl') . "$row->link_image\" $alt $title />";
     127                $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
    128128        } else {
    129129            $output .= $name;
    … …  
    133133
    134134        if ( $show_updated && $row->recently_updated )
    135             $output .= get_settings('links_recently_updated_append');
     135            $output .= get_option('links_recently_updated_append');
    136136
    137137        if ( $show_description && '' != $desc )
    … …  
    257257        $output .= $before;
    258258        if ( $show_updated && $bookmark->recently_updated )
    259             $output .= get_settings('links_recently_updated_prepend');
     259            $output .= get_option('links_recently_updated_prepend');
    260260
    261261        $the_link = '#';
    … …  
    273273        if ( $show_updated )
    274274            if ( '00' != substr($bookmark->link_updated_f, 0, 2) )
    275                 $title .= ' (Last updated ' . date(get_settings('links_updated_date_format'), $bookmark->link_updated_f + (get_settings('gmt_offset') * 3600)) . ')';
     275                $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')';
    276276
    277277        if ( '' != $title )
    … …  
    290290                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
    291291            else // If it's a relative path
    292                 $output .= "<img src=\"" . get_settings('siteurl') . "$bookmark->link_image\" $alt $title />";
     292                $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
    293293        } else {
    294294            $output .= $name;
    … …  
    298298
    299299        if ( $show_updated && $bookmark->recently_updated )
    300             $output .= get_settings('links_recently_updated_append');
     300            $output .= get_option('links_recently_updated_append');
    301301
    302302        if ( $show_description && '' != $desc )

  • trunk/wp-includes/bookmark.php

    r3845 r4144  
    9292    }
    9393
    94     if (get_settings('links_recently_updated_time')) {
    95         $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_settings('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
     94    if (get_option('links_recently_updated_time')) {
     95        $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL " . get_option('links_recently_updated_time') . " MINUTE) >= NOW(), 1,0) as recently_updated ";
    9696    } else {
    9797        $recently_updated_test = '';

  • trunk/wp-includes/category-template.php

    r3881 r4144  
    2424
    2525    if ( empty($catlink) ) {
    26         $file = get_settings('home') . '/';
     26        $file = get_option('home') . '/';
    2727        $catlink = $file . '?cat=' . $category_id;
    2828    } else {
    … …  
    3434
    3535        $catlink = str_replace('%category%', $category_nicename, $catlink);
    36         $catlink = get_settings('home') . trailingslashit($catlink);
     36        $catlink = get_option('home') . trailingslashit($catlink);
    3737    }
    3838    return apply_filters('category_link', $catlink, $category_id);

  • trunk/wp-includes/classes.php

    r4141 r4144  
    99        global $wpdb;
    1010
    11         $list = explode("\n", get_settings('moderation_keys') );
     11        $list = explode("\n", get_option('moderation_keys') );
    1212        $list = array_unique( $list );
    1313        $this->spam_words = $list;
    … …  
    117117            $req_uri = $req_uri_array[0];
    118118            $self = $_SERVER['PHP_SELF'];
    119             $home_path = parse_url(get_settings('home'));
     119            $home_path = parse_url(get_option('home'));
    120120            $home_path = $home_path['path'];
    121121            $home_path = trim($home_path, '/');

  • trunk/wp-includes/comment-template.php

    r3995 r4144  
    9191    global $comment;
    9292    if ( '' == $d )
    93         $date = mysql2date( get_settings('date_format'), $comment->comment_date);
     93        $date = mysql2date( get_option('date_format'), $comment->comment_date);
    9494    else
    9595        $date = mysql2date($d, $comment->comment_date);
    … …  
    188188    $comment_date = $gmt? $comment->comment_date_gmt : $comment->comment_date;
    189189    if ( '' == $d )
    190         $date = mysql2date(get_settings('time_format'), $comment_date);
     190        $date = mysql2date(get_option('time_format'), $comment_date);
    191191    else
    192192        $date = mysql2date($d, $comment_date);
    … …  
    223223function get_trackback_url() {
    224224    global $id;
    225     $tb_url = get_settings('siteurl') . '/wp-trackback.php?p=' . $id;
    226 
    227     if ( '' != get_settings('permalink_structure') )
     225    $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
     226
     227    if ( '' != get_option('permalink_structure') )
    228228        $tb_url = trailingslashit(get_permalink()) . 'trackback/';
    229229
    … …  
    277277        return;
    278278
    279     $req = get_settings('require_name_email');
     279    $req = get_option('require_name_email');
    280280    $commenter = wp_get_current_commenter();
    281281    extract($commenter);
    … …  
    335335    if ($wpcommentsjavascript) {
    336336        if ( empty($wpcommentspopupfile) )
    337             $home = get_settings('home');
     337            $home = get_option('home');
    338338        else
    339             $home = get_settings('siteurl');
     339            $home = get_option('siteurl');
    340340        echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
    341341        echo '" onclick="wpopen(this.href); return false"';

  • trunk/wp-includes/comment.php

    r4133 r4144  
    44    global $wpdb;
    55
    6     if (1 == get_settings('comment_moderation')) return false; // If moderation is set to manual
    7 
    8     if ( (count(explode('http:', $comment)) - 1) >= get_settings('comment_max_links') )
     6    if (1 == get_option('comment_moderation')) return false; // If moderation is set to manual
     7
     8    if ( (count(explode('http:', $comment)) - 1) >= get_option('comment_max_links') )
    99        return false; // Check # of external links
    1010
    11     $mod_keys = trim( get_settings('moderation_keys') );
     11    $mod_keys = trim( get_option('moderation_keys') );
    1212    if ( !empty($mod_keys) ) {
    1313        $words = explode("\n", $mod_keys );
    … …  
    3434
    3535    // Comment whitelisting:
    36     if ( 1 == get_settings('comment_whitelist')) {
     36    if ( 1 == get_option('comment_whitelist')) {
    3737        if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
    3838            $uri = parse_url($url);
    … …  
    125125function get_lastcommentmodified($timezone = 'server') {
    126126    global $cache_lastcommentmodified, $pagenow, $wpdb;
    127     $add_seconds_blog = get_settings('gmt_offset') * 3600;
     127    $add_seconds_blog = get_option('gmt_offset') * 3600;
    128128    $add_seconds_server = date('Z');
    129129    $now = current_time('mysql', 1);
    … …  
    234234    }
    235235
    236     $mod_keys = trim( get_settings('blacklist_keys') );
     236    $mod_keys = trim( get_option('blacklist_keys') );
    237237    if ('' == $mod_keys )
    238238        return false; // If moderation keys are empty
    … …  
    387387        $post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
    388388
    389         if ( get_settings('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
     389        if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
    390390            wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
    391391    }
    … …  
    617617    $excerpt = strip_tags($excerpt);
    618618    if ( function_exists('mb_strcut') ) // For international trackbacks
    619         $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
     619        $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...';
    620620    else
    621621        $excerpt = substr($excerpt, 0, 252) . '...';
    … …  
    636636
    637637function generic_ping($post_id = 0) {
    638     $services = get_settings('ping_sites');
     638    $services = get_option('ping_sites');
    639639    $services = preg_replace("|(\s)+|", '$1', $services); // Kill dupe lines
    640640    $services = trim($services);
    … …  
    745745    $title = urlencode($title);
    746746    $excerpt = urlencode($excerpt);
    747     $blog_name = urlencode(get_settings('blogname'));
     747    $blog_name = urlencode(get_option('blogname'));
    748748    $tb_url = $trackback_url;
    749749    $url = urlencode(get_permalink($ID));
    … …  
    752752    $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'.$trackback_url['query'] : '') . " HTTP/1.0\r\n";
    753753    $http_request .= 'Host: '.$trackback_url['host']."\r\n";
    754     $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_settings('blog_charset')."\r\n";
     754    $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.get_option('blog_charset')."\r\n";
    755755    $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
    756756    $http_request .= "User-Agent: WordPress/" . $wp_version;
    … …  
    790790    $client->debug = false;
    791791    $home = trailingslashit( get_option('home') );
    792     if ( !$client->query('weblogUpdates.extendedPing', get_settings('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
    793         $client->query('weblogUpdates.ping', get_settings('blogname'), $home);
     792    if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
     793        $client->query('weblogUpdates.ping', get_option('blogname'), $home);
    794794}
    795795

  • trunk/wp-includes/cron.php

    r4077 r4144  
    8181        return;
    8282
    83     $cron_url = get_settings( 'siteurl' ) . '/wp-cron.php';
     83    $cron_url = get_option( 'siteurl' ) . '/wp-cron.php';
    8484    $parts = parse_url( $cron_url );
    8585

  • trunk/wp-includes/deprecated.php

    r4142 r4144  
    492492}
    493493
     494function get_settings($option) {
     495    return get_option($option);
     496}
     497
    494498?>

  • trunk/wp-includes/feed.php

    r3862 r4144  
    8888    global $id;
    8989
    90     if ('' != get_settings('permalink_structure'))
     90    if ('' != get_option('permalink_structure'))
    9191        $url = trailingslashit( get_permalink() ) . 'feed/';
    9292    else
    93         $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
     93        $url = get_option('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
    9494
    9595    return apply_filters('post_comments_feed_link', $url);
    … …  
    9898function get_author_rss_link($echo = false, $author_id, $author_nicename) {
    9999       $auth_ID = $author_id;
    100        $permalink_structure = get_settings('permalink_structure');
     100       $permalink_structure = get_option('permalink_structure');
    101101
    102102       if ('' == $permalink_structure) {
    103                  $link = get_settings('home') . '?feed=rss2&amp;author=' . $author_id;
     103                 $link = get_option('home') . '?feed=rss2&amp;author=' . $author_id;
    104104       } else {
    105105                 $link = get_author_link(0, $author_id, $author_nicename);
    … …  
    114114
    115115function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
    116        $permalink_structure = get_settings('permalink_structure');
     116       $permalink_structure = get_option('permalink_structure');
    117117
    118118       if ('' == $permalink_structure) {
    119                  $link = get_settings('home') . '?feed=rss2&amp;cat=' . $cat_ID;
     119                 $link = get_option('home') . '?feed=rss2&amp;cat=' . $cat_ID;
    120120       } else {
    121121                 $link = get_category_link($cat_ID);

  • trunk/wp-includes/formatting.php

    r4135 r4144  
    607607    global $wp_smiliessearch, $wp_smiliesreplace;
    608608    $output = '';
    609     if (get_settings('use_smilies')) {
     609    if (get_option('use_smilies')) {
    610610        // HTML loop taken from texturize function, could possible be consolidated
    611611        $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
    … …  
    657657  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);
    658658  $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
    659   $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_settings('gmt_offset') * 3600);
     659  $string_gmt = gmdate('Y-m-d H:i:s', $string_time - get_option('gmt_offset') * 3600);
    660660  return $string_gmt;
    661661}
    … …  
    666666  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);
    667667  $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
    668   $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_settings('gmt_offset')*3600);
     668  $string_localtime = gmdate('Y-m-d H:i:s', $string_time + get_option('gmt_offset')*3600);
    669669  return $string_localtime;
    670670}
    … …  
    691691      $offset = iso8601_timezone_to_offset($date_bits[7]);
    692692    } else { // we don't have a timezone, so we assume user local timezone (not server's!)
    693       $offset = 3600 * get_settings('gmt_offset');
     693      $offset = 3600 * get_option('gmt_offset');
    694694    }
    695695    $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

    r4127 r4144  
    4646        case 'mysql':
    4747            if ( $gmt ) $d = gmdate('Y-m-d H:i:s');
    48             else $d = gmdate('Y-m-d H:i:s', (time() + (get_settings('gmt_offset') * 3600)));
     48            else $d = gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * 3600)));
    4949            return $d;
    5050            break;
    5151        case 'timestamp':
    5252            if ( $gmt ) $d = time();
    53             else $d = time() + (get_settings('gmt_offset') * 3600);
     53            else $d = time() + (get_option('gmt_offset') * 3600);
    5454            return $d;
    5555            break;
    … …  
    8989    $i = 86400;
    9090
    91     if ( $weekday < get_settings('start_of_week') )
    92         $weekday = 7 - (get_settings('start_of_week') - $weekday);
    93 
    94     while ($weekday > get_settings('start_of_week')) {
     91    if ( $weekday < get_option('start_of_week') )
     92        $weekday = 7 - (get_option('start_of_week') - $weekday);
     93
     94    while ($weekday > get_option('start_of_week')) {
    9595        $weekday = date('w',$day);
    96         if ( $weekday < get_settings('start_of_week') )
    97             $weekday = 7 - (get_settings('start_of_week') - $weekday);
     96        if ( $weekday < get_option('start_of_week') )
     97            $weekday = 7 - (get_option('start_of_week') - $weekday);
    9898
    9999        $day = $day - 86400;
    … …  
    108108function get_lastpostdate($timezone = 'server') {
    109109    global $cache_lastpostdate, $pagenow, $wpdb;
    110     $add_seconds_blog = get_settings('gmt_offset') * 3600;
     110    $add_seconds_blog = get_option('gmt_offset') * 3600;
    111111    $add_seconds_server = date('Z');
    112112    if ( !isset($cache_lastpostdate[$timezone]) ) {
    … …  
    131131function get_lastpostmodified($timezone = 'server') {
    132132    global $cache_lastpostmodified, $pagenow, $wpdb;
    133     $add_seconds_blog = get_settings('gmt_offset') * 3600;
     133    $add_seconds_blog = get_option('gmt_offset') * 3600;
    134134    $add_seconds_server = date('Z');
    135135    if ( !isset($cache_lastpostmodified[$timezone]) ) {
    … …  
    165165/* Options functions */
    166166
    167 function get_settings($setting) {
     167function get_option($setting) {
    168168    global $wpdb;
    169169
    … …  
    187187    // If home is not set use siteurl.
    188188    if ( 'home' == $setting && '' == $value )
    189         return get_settings('siteurl');
     189        return get_option('siteurl');
    190190
    191191    if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
    … …  
    193193
    194194    return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
    195 }
    196 
    197 function get_option($option) {
    198     return get_settings($option);
    199195}
    200196
    … …  
    291287
    292288function gzip_compression() {
    293     if ( !get_settings('gzipcompression') ) return false;
     289    if ( !get_option('gzipcompression') ) return false;
    294290
    295291    if ( extension_loaded('zlib') ) {
    … …  
    325321        $link_text = $matches[4][$i];
    326322        $content = str_replace($link_match, $link_text.' '.$link_number, $content);
    327         $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
     323        $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_option('home') . $link_url : $link_url;
    328324        $links_summary .= "\n".$link_number.' '.$link_url;
    329325    }
    … …  
    882878// Returns an array containing the current upload directory's path and url, or an error message.
    883879function wp_upload_dir() {
    884     $siteurl = get_settings('siteurl');
     880    $siteurl = get_option('siteurl');
    885881    //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
    886     $path = str_replace(ABSPATH, '', trim(get_settings('upload_path')));
     882    $path = str_replace(ABSPATH, '', trim(get_option('upload_path')));
    887883    $dir = ABSPATH . $path;
    888884    $url = trailingslashit($siteurl) . $path;
    … …  
    897893    }
    898894
    899     if ( get_settings('uploads_use_yearmonth_folders')) {
     895    if ( get_option('uploads_use_yearmonth_folders')) {
    900896        // Generate the yearly and monthly dirs
    901897        $time = current_time( 'mysql' );
    … …  
    11021098    global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
    11031099
    1104     $adminurl = get_settings('siteurl') . '/wp-admin';
     1100    $adminurl = get_option('siteurl') . '/wp-admin';
    11051101    if ( wp_get_referer() )
    11061102        $adminurl = wp_get_referer();
    … …  
    11771173</head>
    11781174<body>
    1179     <h1 id="logo"><img alt="WordPress" src="<?php echo get_settings('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
     1175    <h1 id="logo"><img alt="WordPress" src="<?php echo get_option('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
    11801176    <p><?php echo $message; ?></p>
    11811177</body>

  • trunk/wp-includes/general-template.php

    r4138 r4144  
    2929function wp_loginout() {
    3030    if ( ! is_user_logged_in() )
    31         $link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
    32     else
    33         $link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
     31        $link = '<a href="' . get_option('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
     32    else
     33        $link = '<a href="' . get_option('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
    3434
    3535    echo apply_filters('loginout', $link);
    … …  
    4040
    4141    if ( ! is_user_logged_in() ) {
    42         if ( get_settings('users_can_register') )
    43             $link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
     42        if ( get_option('users_can_register') )
     43            $link = $before . '<a href="' . get_option('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
    4444        else
    4545            $link = '';
    4646    } else {
    47         $link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
     47        $link = $before . '<a href="' . get_option('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
    4848    }
    4949
    … …  
    7676        case 'home' :
    7777        case 'siteurl' :
    78             $output = get_settings('home');
     78            $output = get_option('home');
    7979            break;
    8080        case 'wpurl' :
    81             $output = get_settings('siteurl');
     81            $output = get_option('siteurl');
    8282            break;
    8383        case 'description':
    84             $output = get_settings('blogdescription');
     84            $output = get_option('blogdescription');
    8585            break;
    8686        case 'rdf_url':
    … …  
    100100            break;
    101101        case 'pingback_url':
    102             $output = get_settings('siteurl') .'/xmlrpc.php';
     102            $output = get_option('siteurl') .'/xmlrpc.php';
    103103            break;
    104104        case 'stylesheet_url':
    … …  
    113113            break;
    114114        case 'admin_email':
    115             $output = get_settings('admin_email');
     115            $output = get_option('admin_email');
    116116            break;
    117117        case 'charset':
    118             $output = get_settings('blog_charset');
     118            $output = get_option('blog_charset');
    119119            if ('' == $output) $output = 'UTF-8';
    120120            break;
    … …  
    128128        case 'name':
    129129        default:
    130             $output = get_settings('blogname');
     130            $output = get_option('blogname');
    131131            break;
    132132    }
    … …  
    310310
    311311    if ( !$archive_date_format_over_ride ) {
    312         $archive_day_date_format = get_settings('date_format');
    313         $archive_week_start_date_format = get_settings('date_format');
    314         $archive_week_end_date_format = get_settings('date_format');
    315     }
    316 
    317     $add_hours = intval(get_settings('gmt_offset'));
    318     $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
     312        $archive_day_date_format = get_option('date_format');
     313        $archive_week_start_date_format = get_option('date_format');
     314        $archive_week_end_date_format = get_option('date_format');
     315    }
     316
     317    $add_hours = intval(get_option('gmt_offset'));
     318    $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
    319319
    320320    if ( 'monthly' == $type ) {
    … …  
    359359        }
    360360    } elseif ( 'weekly' == $type ) {
    361         $start_of_week = get_settings('start_of_week');
     361        $start_of_week = get_option('start_of_week');
    362362        $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);
    363363        $arc_w_last = '';
    … …  
    367367                        $arc_year = $arcresult->yr;
    368368                        $arc_w_last = $arcresult->week;
    369                         $arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
     369                        $arc_week = get_weekstartend($arcresult->yyyymmdd, get_option('start_of_week'));
    370370                        $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
    371371                        $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
    372                         $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
     372                        $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_option('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
    373373                        $text = $arc_week_start . $archive_week_separator . $arc_week_end;
    374374                        echo get_archives_link($url, $text, $format, $before, $after);
    … …  
    417417
    418418    // week_begins = 0 stands for Sunday
    419     $week_begins = intval(get_settings('start_of_week'));
    420     $add_hours = intval(get_settings('gmt_offset'));
    421     $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
     419    $week_begins = intval(get_option('start_of_week'));
     420    $add_hours = intval(get_option('gmt_offset'));
     421    $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
    422422
    423423    // Let's figure out when we are
    … …  
    438438                $thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
    439439    } else {
    440         $thisyear = gmdate('Y', current_time('timestamp') + get_settings('gmt_offset') * 3600);
    441         $thismonth = gmdate('m', current_time('timestamp') + get_settings('gmt_offset') * 3600);
     440        $thisyear = gmdate('Y', current_time('timestamp') + get_option('gmt_offset') * 3600);
     441        $thismonth = gmdate('m', current_time('timestamp') + get_option('gmt_offset') * 3600);
    442442    }
    443443
    … …  
    559559        $newrow = false;
    560560
    561         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)) )
     561        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)) )
    562562            echo '<td id="today">';
    563563        else
    … …  
    614614        $the_date .= $before;
    615615        if ( $d=='' )
    616             $the_date .= mysql2date(get_settings('date_format'), $post->post_date);
     616            $the_date .= mysql2date(get_option('date_format'), $post->post_date);
    617617        else
    618618            $the_date .= mysql2date($d, $post->post_date);
    … …  
    635635function get_the_modified_date($d = '') {
    636636    if ( '' == $d )
    637         $the_time = get_post_modified_time(get_settings('date_format'));
     637        $the_time = get_post_modified_time(get_option('date_format'));
    638638    else
    639639        $the_time = get_post_modified_time($d);
    … …  
    649649function get_the_time( $d = '' ) {
    650650    if ( '' == $d )
    651         $the_time = get_post_time(get_settings('time_format'));
     651        $the_time = get_post_time(get_option('time_format'));
    652652    else
    653653        $the_time = get_post_time($d);
    … …  
    675675function get_the_modified_time($d = '') {
    676676    if ( '' == $d )
    677         $the_time = get_post_modified_time(get_settings('time_format'));
     677        $the_time = get_post_modified_time(get_option('time_format'));
    678678    else
    679679        $the_time = get_post_modified_time($d);
    … …  
    742742 */
    743743function the_editor($content, $id = 'content', $prev_id = 'title') {
    744     $rows = get_settings('default_post_edit_rows');
     744    $rows = get_option('default_post_edit_rows');
    745745    if (($rows < 3) || ($rows > 100))
    746746        $rows = 12;

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

    r3664 r4144  
    88<head>
    99<title><?php _e('Rich Editor Help') ?></title>
    10 <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
     10<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
    1111<style type="text/css">
    1212    #wphead {

  • trunk/wp-includes/link-template.php

    r4133 r4144  
    4848        return get_attachment_link($post->ID);
    4949
    50     $permalink = get_settings('permalink_structure');
     50    $permalink = get_option('permalink_structure');
    5151
    5252    if ( '' != $permalink && 'draft' != $post->post_status ) {
    … …  
    7878            $post->post_name,
    7979        );
    80         return apply_filters('post_link', get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
     80        return apply_filters('post_link', get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
    8181    } else { // if they're not using the fancy permalink option
    82         $permalink = get_settings('home') . '/?p=' . $post->ID;
     82        $permalink = get_option('home') . '/?p=' . $post->ID;
    8383        return apply_filters('post_link', $permalink, $post);
    8484    }
    … …  
    101101        $link = get_page_uri($id);
    102102        $link = str_replace('%pagename%', $link, $pagestruct);
    103         $link = get_settings('home') . "/$link/";
    104     } else {
    105         $link = get_settings('home') . "/?page_id=$id";
     103        $link = get_option('home') . "/$link/";
     104    } else {
     105        $link = get_option('home') . "/?page_id=$id";
    106106    }
    107107
    108108    if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
    109         $link = get_settings('home');
     109        $link = get_option('home');
    110110
    111111    return apply_filters('page_link', $link, $id);
    … …  
    139139    global $wp_rewrite;
    140140    if ( !$year )
    141         $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
     141        $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
    142142    $yearlink = $wp_rewrite->get_year_permastruct();
    143143    if ( !empty($yearlink) ) {
    144144        $yearlink = str_replace('%year%', $year, $yearlink);
    145         return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
    146     } else {
    147         return apply_filters('year_link', get_settings('home') . '/?m=' . $year, $year);
     145        return apply_filters('year_link', get_option('home') . trailingslashit($yearlink), $year);
     146    } else {
     147        return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
    148148    }
    149149}
    … …  
    152152    global $wp_rewrite;
    153153    if ( !$year )
    154         $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
     154        $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
    155155    if ( !$month )
    156         $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
     156        $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
    157157    $monthlink = $wp_rewrite->get_month_permastruct();
    158158    if ( !empty($monthlink) ) {
    159159        $monthlink = str_replace('%year%', $year, $monthlink);
    160160        $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
    161         return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
    162     } else {
    163         return apply_filters('month_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
     161        return apply_filters('month_link', get_option('home') . trailingslashit($monthlink), $year, $month);
     162    } else {
     163        return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
    164164    }
    165165}
    … …  
    168168    global $wp_rewrite;
    169169    if ( !$year )
    170         $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
     170        $year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
    171171    if ( !$month )
    172         $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
     172        $month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
    173173    if ( !$day )
    174         $day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
     174        $day = gmdate('j', time()+(get_option('gmt_offset') * 3600));
    175175
    176176    $daylink = $wp_rewrite->get_day_permastruct();
    … …  
    179179        $daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
    180180        $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
    181         return apply_filters('day_link', get_settings('home') . trailingslashit($daylink), $year, $month, $day);
    182     } else {
    183         return apply_filters('day_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
     181        return apply_filters('day_link', get_option('home') . trailingslashit($daylink), $year, $month, $day);
     182    } else {
     183        return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
    184184    }
    185185}
    … …  
    188188    global $wp_rewrite;
    189189    $do_perma = 0;
    190     $feed_url = get_settings('siteurl');
     190    $feed_url = get_option('siteurl');
    191191    $comment_feed_url = $feed_url;
    192192
    … …  
    203203        $permalink = str_replace('%feed%', $feed, $permalink);
    204204        $permalink = preg_replace('#/+#', '/', "/$permalink/");
    205         $output =  get_settings('home') . $permalink;
     205        $output =  get_option('home') . $permalink;
    206206    } else {
    207207        if ( false !== strpos($feed, 'comments_') )
    208208            $feed = str_replace('comments_', 'comments-', $feed);
    209209
    210         $output = get_settings('home') . "/?feed={$feed}";
     210        $output = get_option('home') . "/?feed={$feed}";
    211211    }
    212212
    … …  
    230230    }
    231231
    232     $location = get_settings('siteurl') . "/wp-admin/{$file}.php?action=edit&amp;post=$post->ID";
     232    $location = get_option('siteurl') . "/wp-admin/{$file}.php?action=edit&amp;post=$post->ID";
    233233    echo $before . "<a href=\"$location\">$link</a>" . $after;
    234234}
    … …  
    245245    }
    246246
    247     $location = get_settings('siteurl') . "/wp-admin/comment.php?action=editcomment&amp;comment=$comment->comment_ID";
     247    $location = get_option('siteurl') . "/wp-admin/comment.php?action=editcomment&amp;comment=$comment->comment_ID";
    248248    echo $before . "<a href='$location'>$link</a>" . $after;
    249249}
    … …  
    363363    $permalink = 0;
    364364
    365     $home_root = parse_url(get_settings('home'));
     365    $home_root = parse_url(get_option('home'));
    366366    $home_root = $home_root['path'];
    367367    $home_root = trailingslashit($home_root);
    … …  
    391391            $qstr .=    '&amp;' . $page_querystring . '=' . $pagenum;
    392392            // otherwise, it could be rewritten, OR just the default index ...
    393         } elseif( '' != get_settings('permalink_structure') && ! is_admin() ) {
     393        } elseif( '' != get_option('permalink_structure') && ! is_admin() ) {
    394394            $permalink = 1;
    395395            $index = $wp_rewrite->index;
    … …  
    413413    if ( $permalink )
    414414        $qstr = trailingslashit($qstr);
    415     $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_settings('home') ) . $qstr );
     415    $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_option('home') ) . $qstr );
    416416
    417417    // showing /page/1/ or ?paged=1 is redundant

  • trunk/wp-includes/pluggable.php

    r4133 r4144  
    164164        $headers = "MIME-Version: 1.0\n" .
    165165            "From: wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . "\n" .
    166             "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
     166            "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
    167167    }
    168168
    … …  
    222222        nocache_headers();
    223223
    224         wp_redirect(get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
     224        wp_redirect(get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
    225225        exit();
    226226    }
    … …  
    230230if ( !function_exists('check_admin_referer') ) :
    231231function check_admin_referer($action = -1) {
    232     $adminurl = strtolower(get_settings('siteurl')).'/wp-admin';
     232    $adminurl = strtolower(get_option('siteurl')).'/wp-admin';
    233233    $referer = strtolower(wp_get_referer());
    234234    if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
    … …  
    338338    $comment_author_domain = gethostbyaddr($comment->comment_author_IP);
    339339
    340     $blogname = get_settings('blogname');
     340    $blogname = get_option('blogname');
    341341
    342342    if ( empty( $comment_type ) ) $comment_type = 'comment';
    … …  
    367367    }
    368368    $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
    369     $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";
    370     $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";
     369    $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";
     370    $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";
    371371
    372372    $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
    … …  
    384384    $message_headers = "MIME-Version: 1.0\n"
    385385        . "$from\n"
    386         . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
     386        . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
    387387
    388388    if ( isset($reply_to) )
    … …  
    408408    global $wpdb;
    409409
    410     if( get_settings( "moderation_notify" ) == 0 )
     410    if( get_option( "moderation_notify" ) == 0 )
    411411        return true;
    412412   
    … …  
    424424    $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
    425425    $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    426     $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";
    427     $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";
    428     $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";
     426    $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";
     427    $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";
     428    $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";
    429429    $notify_message .= sprintf( __('Currently %s comments are waiting for approval. Please visit the moderation panel:'), $comments_waiting ) . "\r\n";
    430     $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
    431 
    432     $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_settings('blogname'), $post->post_title );
    433     $admin_email = get_settings('admin_email');
     430    $notify_message .= get_option('siteurl') . "/wp-admin/moderation.php\r\n";
     431
     432    $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
     433    $admin_email = get_option('admin_email');
    434434
    435435    $notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id);
    … …  
    449449    $user_email = stripslashes($user->user_email);
    450450
    451     $message  = sprintf(__('New user registration on your blog %s:'), get_settings('blogname')) . "\r\n\r\n";
     451    $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
    452452    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
    453453    $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
    454454
    455     @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
     455    @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
    456456
    457457    if ( empty($plaintext_pass) )
    … …  
    460460    $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
    461461    $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
    462     $message .= get_settings('siteurl') . "/wp-login.php\r\n";
    463 
    464     wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_settings('blogname')), $message);
     462    $message .= get_option('siteurl') . "/wp-login.php\r\n";
     463
     464    wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
    465465
    466466}

  • trunk/wp-includes/post-template.php

    r4142 r4144  
    152152                $output .= ' ';
    153153                if ( ($i != $page) || ((!$more) && ($page==1)) ) {
    154                     if ( '' == get_settings('permalink_structure') )
     154                    if ( '' == get_option('permalink_structure') )
    155155                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
    156156                    else
    … …  
    167167                $i = $page - 1;
    168168                if ( $i && $more ) {
    169                     if ( '' == get_settings('permalink_structure') )
     169                    if ( '' == get_option('permalink_structure') )
    170170                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">'.$previouspagelink.'</a>';
    171171                    else
    … …  
    174174                $i = $page + 1;
    175175                if ( $i <= $numpages && $more ) {
    176                     if ( '' == get_settings('permalink_structure') )
     176                    if ( '' == get_option('permalink_structure') )
    177177                        $output .= '<a href="'.get_permalink() . '&amp;page=' . $i . '">'.$nextpagelink.'</a>';
    178178                    else
    … …  
    265265        parse_str($args, $r);
    266266
    267     $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_settings('date_format'),
     267    $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_option('date_format'),
    268268        'child_of' => 0, 'title_li' => __('Pages'), 'echo' => 1);
    269269    $r = array_merge($defaults, $r);
    … …  
    441441
    442442function get_the_password_form() {
    443     $output = '<form action="' . get_settings('siteurl') . '/wp-pass.php" method="post">
     443    $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
    444444    <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
    445445    <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

    r4133 r4144  
    561561            $comment_status = 'closed';
    562562        else
    563             $comment_status = get_settings('default_comment_status');
     563            $comment_status = get_option('default_comment_status');
    564564    }
    565565    if ( empty($ping_status) )
    566         $ping_status = get_settings('default_ping_status');
     566        $ping_status = get_option('default_ping_status');
    567567    if ( empty($post_pingback) )
    568568        $post_pingback = get_option('default_pingback_flag');
    … …  
    12001200            $comment_status = 'closed';
    12011201        else
    1202             $comment_status = get_settings('default_comment_status');
     1202            $comment_status = get_option('default_comment_status');
    12031203    }
    12041204    if ( empty($ping_status) )
    1205         $ping_status = get_settings('default_ping_status');
     1205        $ping_status = get_option('default_ping_status');
    12061206    if ( empty($post_pingback) )
    12071207        $post_pingback = get_option('default_pingback_flag');

  • trunk/wp-includes/query.php

    r4133 r4144  
    546546        $post_type = $q['post_type'];
    547547        if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
    548             $q['posts_per_page'] = get_settings('posts_per_page');
     548            $q['posts_per_page'] = get_option('posts_per_page');
    549549        if ( !isset($q['what_to_show']) )
    550             $q['what_to_show'] = get_settings('what_to_show');
     550            $q['what_to_show'] = get_option('what_to_show');
    551551        if ( isset($q['showposts']) && $q['showposts'] ) {
    552552            $q['showposts'] = (int) $q['showposts'];
    … …  
    563563        }
    564564        if ( $this->is_feed ) {
    565             $q['posts_per_page'] = get_settings('posts_per_rss');
     565            $q['posts_per_page'] = get_option('posts_per_rss');
    566566            $q['what_to_show'] = 'posts';
    567567        }
    … …  
    584584        }
    585585
    586         $add_hours = intval(get_settings('gmt_offset'));
    587         $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
     586        $add_hours = intval(get_option('gmt_offset'));
     587        $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
    588588        $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
    589589

  • trunk/wp-includes/registration.php

    r3865 r4144  
    110110    if ( !$update ) {
    111111        $user = new WP_User($user_id);
    112         $user->set_role(get_settings('default_role'));
     112        $user->set_role(get_option('default_role'));
    113113    }
    114114

  • trunk/wp-includes/rewrite.php

    r4133 r4144  
    9090
    9191    // Add 'www.' if it is absent and should be there
    92     if ( false !== strpos(get_settings('home'), '://www.') && false === strpos($url, '://www.') )
     92    if ( false !== strpos(get_option('home'), '://www.') && false === strpos($url, '://www.') )
    9393        $url = str_replace('://', '://www.', $url);
    9494
    9595    // Strip 'www.' if it is present and shouldn't be
    96     if ( false === strpos(get_settings('home'), '://www.') )
     96    if ( false === strpos(get_option('home'), '://www.') )
    9797        $url = str_replace('://www.', '://', $url);
    9898
    … …  
    101101        $url = str_replace('index.php/', '', $url);
    102102
    103     if ( false !== strpos($url, get_settings('home')) ) {
     103    if ( false !== strpos($url, get_option('home')) ) {
    104104        // Chop off http://domain.com
    105         $url = str_replace(get_settings('home'), '', $url);
     105        $url = str_replace(get_option('home'), '', $url);
    106106    } else {
    107107        // Chop off /path/to/blog
    108         $home_path = parse_url(get_settings('home'));
     108        $home_path = parse_url(get_option('home'));
    109109        $home_path = $home_path['path'];
    110110        $url = str_replace($home_path, '', $url);
    … …  
    260260
    261261    function page_rewrite_rules() {
    262         $uris = get_settings('page_uris');
    263         $attachment_uris = get_settings('page_attachment_uris');
     262        $uris = get_option('page_uris');
     263        $attachment_uris = get_option('page_attachment_uris');
    264264
    265265        $rewrite_rules = array();
    … …  
    758758        }
    759759
    760         $site_root = parse_url(get_settings('siteurl'));
     760        $site_root = parse_url(get_option('siteurl'));
    761761        $site_root = trailingslashit($site_root['path']);
    762762
    763         $home_root = parse_url(get_settings('home'));
     763        $home_root = parse_url(get_option('home'));
    764764        $home_root = trailingslashit($home_root['path']);
    765765   
    … …  
    854854    function init() {
    855855        $this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
    856         $this->permalink_structure = get_settings('permalink_structure');
     856        $this->permalink_structure = get_option('permalink_structure');
    857857        $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
    858858        $this->root = '';
    … …  
    860860            $this->root = $this->index . '/';
    861861        }
    862         $this->category_base = get_settings('category_base');
     862        $this->category_base = get_option('category_base');
    863863        unset($this->category_structure);
    864864        unset($this->author_structure);

  • trunk/wp-includes/script-loader.php

    r4107 r4144  
    6666                if ( isset($this->args[$handle]) )
    6767                    $ver .= '&amp;' . $this->args[$handle];
    68                 $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_settings( 'siteurl' ) . $this->scripts[$handle]->src;
     68                $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src;
    6969                echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n";
    7070                $this->printed[] = $handle;

  • trunk/wp-includes/theme.php

    r4035 r4144  
    55
    66function get_stylesheet() {
    7     return apply_filters('stylesheet', get_settings('stylesheet'));
     7    return apply_filters('stylesheet', get_option('stylesheet'));
    88}
    99
    … …  
    2727
    2828function get_template() {
    29     return apply_filters('template', get_settings('template'));
     29    return apply_filters('template', get_option('template'));
    3030}
    3131
    … …  
    238238    $themes = get_themes();
    239239    $theme_names = array_keys($themes);
    240     $current_template = get_settings('template');
    241     $current_stylesheet = get_settings('stylesheet');
     240    $current_template = get_option('template');
     241    $current_stylesheet = get_option('stylesheet');
    242242    $current_theme = 'WordPress Default';
    243243
    … …  
    260260
    261261function get_theme_root_uri() {
    262     return apply_filters('theme_root_uri', get_settings('siteurl') . "/wp-content/themes", get_settings('siteurl'));
     262    return apply_filters('theme_root_uri', get_option('siteurl') . "/wp-content/themes", get_option('siteurl'));
    263263}
    264264

  • trunk/wp-includes/vars.php

    r3990 r4144  
    9090    $wp_smiliessearch[] = $smiley;
    9191    $smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
    92     $wp_smiliesreplace[] = " <img src='" . get_settings('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
     92    $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
    9393}
    9494

  • trunk/wp-links-opml.php

    r3875 r4144  
    66}
    77
    8 header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
     8header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
    99$link_cat = $_GET['link_cat'];
    1010if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) {

  • trunk/wp-login.php

    r4143 r4144  
    1717
    1818    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
    19     if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
     19    if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
    2020        update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
    2121}
    … …  
    4646    <title>WordPress &raquo; <?php _e('Lost Password') ?></title>
    4747    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
    48     <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
     48    <link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
    4949    <script type="text/javascript">
    5050    function focusit() {
    … …  
    8181<ul>
    8282    <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
    83 <?php if (get_settings('users_can_register')) : ?>
     83<?php if (get_option('users_can_register')) : ?>
    8484    <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
    8585<?php endif; ?>
    … …  
    112112    $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
    113113    $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
    114     $message .= get_settings('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
    115 
    116     $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_settings('blogname')), $message);
     114    $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
     115
     116    $m = wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message);
    117117
    118118    if ($m == false) {
    … …  
    146146    $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
    147147    $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
    148     $message .= get_settings('siteurl') . "/wp-login.php\r\n";
    149 
    150     $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_settings('blogname')), $message);
     148    $message .= get_option('siteurl') . "/wp-login.php\r\n";
     149
     150    $m = wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message);
    151151
    152152    if ($m == false) {
    … …  
    159159        // send a copy of password change notification to the admin
    160160        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
    161         wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_settings('blogname')), $message);
     161        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
    162162        die();
    163163    }
    … …  
    196196        // If the user can't edit posts, send them to their profile.
    197197        if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) )
    198             $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
     198            $redirect_to = get_option('siteurl') . '/wp-admin/profile.php';
    199199
    200200        if ( wp_login($user_login, $user_pass, $using_cookie) ) {
    … …  
    247247<ul>
    248248    <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>">&laquo; <?php _e('Back to blog') ?></a></li>
    249 <?php if (get_settings('users_can_register')) : ?>
     249<?php if (get_option('users_can_register')) : ?>
    250250    <li><a href="<?php bloginfo('wpurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
    251251<?php endif; ?>

  • trunk/wp-mail.php

    r4006 r4144  
    66error_reporting(2037);
    77
    8 $time_difference = get_settings('gmt_offset') * 3600;
     8$time_difference = get_option('gmt_offset') * 3600;
    99
    1010$phone_delim = '::';
    … …  
    1212$pop3 = new POP3();
    1313
    14 if (!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port')))
     14if (!$pop3->connect(get_option('mailserver_url'), get_option('mailserver_port')))
    1515    wp_die($pop3->ERROR);
    1616
    17 $count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass'));
     17$count = $pop3->login(get_option('mailserver_login'), get_option('mailserver_pass'));
    1818if (0 == $count) wp_die(__('There doesn&#8217;t seem to be any new mail.'));
    1919
    … …  
    103103    endforeach;
    104104
    105     $subject = trim(str_replace(get_settings('subjectprefix'), '', $subject));
     105    $subject = trim(str_replace(get_option('subjectprefix'), '', $subject));
    106106
    107107    if ($content_type == 'multipart/alternative') {
    … …  
    127127    if ($post_title == '') $post_title = $subject;
    128128
    129     if (empty($post_categories)) $post_categories[] = get_settings('default_email_category');
     129    if (empty($post_categories)) $post_categories[] = get_option('default_email_category');
    130130
    131131    $post_category = $post_categories;

  • trunk/wp-rdf.php

    r2860 r4144  
    66}
    77
    8 header('Content-type: application/rdf+xml; charset=' . get_settings('blog_charset'), true);
     8header('Content-type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
    99$more = 1;
    1010
    1111?>
    12 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
     12<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
    1313<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    1414<rdf:RDF
    … …  
    4646    <dc:creator><?php the_author() ?></dc:creator>
    4747    <?php the_category_rss('rdf') ?>
    48 <?php if (get_settings('rss_use_excerpt')) : ?>
     48<?php if (get_option('rss_use_excerpt')) : ?>
    4949    <description><?php the_excerpt_rss() ?></description>
    5050<?php else : ?>
    51     <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description>
     51    <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length'), 2) ?></description>
    5252    <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
    5353<?php endif; ?>

  • trunk/wp-register.php

    r3862 r4144  
    44
    55$action = $_REQUEST['action'];
    6 if ( !get_settings('users_can_register') )
     6if ( !get_option('users_can_register') )
    77    $action = 'disabled';
    88
    … …  
    4545        $user_id = wp_create_user( $user_login, $password, $user_email );
    4646        if ( !$user_id )
    47             $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'));
     47            $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'));
    4848        else
    4949            wp_new_user_notification($user_id, $password);
    … …  
    5757<head>
    5858    <title>WordPress &raquo; <?php _e('Registration Complete') ?></title>
    59     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     59    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    6060    <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
    6161    <style type="text/css">
    … …  
    8888<head>
    8989    <title>WordPress &raquo; <?php _e('Registration Form') ?></title>
    90     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     90    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    9191    <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
    9292    <style type="text/css">
    … …  
    137137<head>
    138138    <title>WordPress &raquo; <?php _e('Registration Currently Disabled') ?></title>
    139     <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
     139    <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    140140    <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css">
    141141</head>
    … …  
    146146    <h2><?php _e('Registration Disabled') ?></h2>
    147147    <p><?php _e('User registration is currently not allowed.') ?><br />
    148     <a href="<?php echo get_settings('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
     148    <a href="<?php echo get_option('home'); ?>/" title="<?php _e('Go back to the blog') ?>"><?php _e('Home') ?></a>
    149149    </p>
    150150</div>

  • trunk/wp-rss.php

    r2627 r4144  
    66}
    77
    8 header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
     8header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
    99$more = 1;
    1010
    1111?>
    12 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
     12<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
    1313<!-- generator="wordpress/<?php echo $wp_version ?>" -->
    1414<rss version="0.92">
    … …  
    2525    <item>
    2626        <title><?php the_title_rss() ?></title>
    27 <?php if (get_settings('rss_use_excerpt')) { ?>
     27<?php if (get_option('rss_use_excerpt')) { ?>
    2828        <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
    2929<?php } else { // use content ?>
    30         <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
     30        <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length')) ?></description>
    3131<?php } ?>
    3232        <link><?php permalink_single_rss() ?></link>
    3333        <?php do_action('rss_item'); ?>
    3434    </item>
    35 <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
     35<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
    3636</channel>
    3737</rss>

  • trunk/wp-rss2.php

    r3866 r4144  
    66}
    77
    8 header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
     8header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
    99$more = 1;
    1010
    1111?>
    12 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
     12<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
    1313
    1414<!-- generator="wordpress/<?php bloginfo_rss('version') ?>" -->
    … …  
    3838
    3939        <guid isPermaLink="false"><?php the_guid(); ?></guid>
    40 <?php if (get_settings('rss_use_excerpt')) : ?>
     40<?php if (get_option('rss_use_excerpt')) : ?>
    4141        <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
    4242<?php else : ?>
    … …  
    5252    <?php do_action('rss2_item'); ?>
    5353    </item>
    54     <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && !is_date()) { break; } } } ?>
     54    <?php $items_count++; if (($items_count == get_option('posts_per_rss')) && !is_date()) { break; } } } ?>
    5555</channel>
    5656</rss>

  • trunk/wp-settings.php

    r4131 r4144  
    142142if (!strstr($_SERVER['PHP_SELF'], 'install.php')) :
    143143    // Used to guarantee unique hash cookies
    144     $cookiehash = md5(get_settings('siteurl')); // Remove in 1.4
     144    $cookiehash = md5(get_option('siteurl')); // Remove in 1.4
    145145    define('COOKIEHASH', $cookiehash);
    146146endif;
    … …  
    151151    define('PASS_COOKIE', 'wordpresspass_'. COOKIEHASH);
    152152if ( !defined('COOKIEPATH') )
    153     define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
     153    define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
    154154if ( !defined('SITECOOKIEPATH') )
    155     define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) );
     155    define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
    156156if ( !defined('COOKIE_DOMAIN') )
    157157    define('COOKIE_DOMAIN', false);
    … …  
    160160
    161161// Check for hacks file if the option is enabled
    162 if (get_settings('hack_file')) {
     162if (get_option('hack_file')) {
    163163    if (file_exists(ABSPATH . '/my-hacks.php'))
    164164        require(ABSPATH . '/my-hacks.php');
    165165}
    166166
    167 if ( get_settings('active_plugins') ) {
    168     $current_plugins = get_settings('active_plugins');
     167if ( get_option('active_plugins') ) {
     168    $current_plugins = get_option('active_plugins');
    169169    if ( is_array($current_plugins) ) {
    170170        foreach ($current_plugins as $plugin) {

  • trunk/wp-trackback.php

    r4133 r4144  
    4343
    4444if ( function_exists('mb_convert_encoding') ) { // For international trackbacks
    45     $title     = mb_convert_encoding($title, get_settings('blog_charset'), $charset);
    46     $excerpt   = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset);
    47     $blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset);
     45    $title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
     46    $excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
     47    $blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
    4848}
    4949
    … …  
    7171    $excerpt = strip_tags($excerpt);
    7272    if ( function_exists('mb_strcut') ) { // For international trackbacks
    73         $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...';
    74         $title = mb_strcut($title, 0, 250, get_settings('blog_charset')) . '...';
     73        $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...';
     74        $title = mb_strcut($title, 0, 250, get_option('blog_charset')) . '...';
    7575    } else {
    7676        $excerpt = (strlen($excerpt) > 255) ? substr($excerpt, 0, 252) . '...' : $excerpt;

  • trunk/xmlrpc.php

    r4133 r4144  
    1313
    1414if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
    15 header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
     15header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
    1616
    1717?>
    18 <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
     18<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
    1919<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
    2020  <service>
    … …  
    191191      $struct = array(
    192192        'isAdmin'  => $is_admin,
    193         'url'      => get_settings('home') . '/',
     193        'url'      => get_option('home') . '/',
    194194        'blogid'   => '1',
    195         'blogName' => get_settings('blogname')
     195        'blogName' => get_option('blogname')
    196196      );
    197197
    … …  
    330330
    331331      /* warning: here we make the assumption that the weblog's URL is on the same server */
    332       $filename = get_settings('home') . '/';
     332      $filename = get_option('home') . '/';
    333333      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    334334
    … …  
    365365
    366366      /* warning: here we make the assumption that the weblog's URL is on the same server */
    367       $filename = get_settings('home') . '/';
     367      $filename = get_option('home') . '/';
    368368      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
    369369
    … …  
    545545
    546546      $comment_status = (empty($content_struct['mt_allow_comments'])) ?
    547         get_settings('default_comment_status')
     547        get_option('default_comment_status')
    548548        : $content_struct['mt_allow_comments'];
    549549
    550550      $ping_status = (empty($content_struct['mt_allow_pings'])) ?
    551         get_settings('default_ping_status')
     551        get_option('default_ping_status')
    552552        : $content_struct['mt_allow_pings'];
    553553
    … …  
    642642
    643643      $comment_status = (empty($content_struct['mt_allow_comments'])) ?
    644         get_settings('default_comment_status')
     644        get_option('default_comment_status')
    645645        : $content_struct['mt_allow_comments'];
    646646
    647647      $ping_status = (empty($content_struct['mt_allow_pings'])) ?
    648         get_settings('default_ping_status')
     648        get_option('default_ping_status')
    649649        : $content_struct['mt_allow_pings'];
    650650
    … …  
    11121112
    11131113        // Check if the page linked to is in our site
    1114         $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_settings('home')));
     1114        $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
    11151115        if( !$pos1 )
    11161116            return new IXR_Error(0, 'Is there no link to us?');
Note: See TracChangeset for help on using the changeset viewer.