Changeset 4144

Show
Ignore:
Timestamp:
08/30/06 21:46:31 (2 years ago)
Author:
ryan
Message:

Use get_option instead of get_settings. Just 'cause.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 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');