WordPress.org
Get WordPress

Make WordPress Core

Changeset 955


Ignore:
Timestamp:
02/29/2004 08:43:36 AM (21 years ago)
Author:
saxmatt
Message:

Migrating more of the global options to get_settings().

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r870 r955  
    9090        <div id="quicktags">
    9191<?php
    92 if ($use_quicktags) {
     92if ( get_settings('use_quicktags') ) {
    9393    echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
    9494    include('quicktags.php');
    … …  
    106106
    107107<?php
    108 if ($use_quicktags) {
     108if ( get_settings('use_quicktags') ) {
    109109?>
    110110<script type="text/javascript" language="JavaScript">

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

    r872 r955  
    4444        <div id="quicktags">
    4545<?php
    46 if ($use_quicktags) {
     46if (get_settings('use_quicktags')) {
    4747    echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
    4848    include('quicktags.php');
    … …  
    6060
    6161<?php
    62 if ($use_quicktags) {
     62if (get_settings('use_quicktags')) {
    6363?>
    6464<script type="text/javascript" language="JavaScript">

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

    r869 r955  
    7676        <div id="quicktags">
    7777<?php
    78 if ($use_quicktags && 'bookmarklet' != $mode) {
     78if (get_settings('use_quicktags') && 'bookmarklet' != $mode) {
    7979    echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
    8080    include('quicktags.php');
    … …  
    9292
    9393<?php
    94 if ($use_quicktags) {
     94if (get_settings('use_quicktags')) {
    9595?>
    9696<script type="text/javascript" language="JavaScript">

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

    r954 r955  
    708708   
    709709    $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 6");
     710    $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 7");
    710711
    711712    // Add blog_charset option

  • trunk/wp-admin/users.php

    r945 r955  
    7171    $user_lastname = addslashes(stripslashes($user_lastname));
    7272    $now = gmdate('Y-m-d H:i:s');
     73    $new_users_can_blog = get_settings('new_users_can_blog');
    7374
    7475    $result = $wpdb->query("INSERT INTO $tableusers

  • trunk/wp-includes/functions-formatting.php

    r928 r955  
    295295}
    296296
    297 function convert_bbcode($content) {
    298     global $wp_bbcode, $use_bbcode;
    299     if ($use_bbcode) {
    300         $content = preg_replace($wp_bbcode["in"], $wp_bbcode["out"], $content);
    301     }
    302     $content = convert_bbcode_email($content);
     297function convert_bbcode($content) { // depreciated
    303298    return $content;
    304299}
    … …  
    319314}
    320315
    321 function convert_gmcode($content) {
    322     global $wp_gmcode, $use_gmcode;
    323     if ($use_gmcode) {
    324         $content = preg_replace($wp_gmcode["in"], $wp_gmcode["out"], $content);
    325     }
     316function convert_gmcode($content) { // depreciated
    326317    return $content;
    327318}

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

    r945 r955  
    2323
    2424function get_bloginfo($show='') {
    25     global $blogname, $blogdescription, $admin_email;
     25    global $blogname, $admin_email;
    2626
    2727    $do_perma = 0;
    … …  
    4040            break;
    4141        case 'description':
    42             $output = $blogdescription;
     42            $output = get_settings('blogdescription');
    4343            break;
    4444        case 'rdf_url':

  • trunk/wp-login.php

    r945 r955  
    282282<p>
    283283    <a href="<?php echo get_settings('siteurl'); ?>" title="Are you lost?">Back to blog?</a><br />
    284 <?php if ($users_can_register) { ?>
     284<?php if (get_settings('users_can_register')) { ?>
    285285    <a href="<?php echo get_settings('siteurl'); ?>/wp-register.php" title="Register to be an author">Register?</a><br />
    286286<?php } ?>

  • trunk/wp-register.php

    r945 r955  
    3535}
    3636
    37 if (!$users_can_register) {
     37if (!get_settings('users_can_register')) {
    3838    $action = 'disabled';
    3939}
    … …  
    8989    $user_nickname = addslashes($user_nickname);
    9090    $now = gmdate('Y-m-d H:i:s');
     91    $new_users_can_blog = get_settings('new_users_can_blog');
    9192
    9293    $result = $wpdb->query("INSERT INTO $tableusers

  • trunk/wp-settings.php

    r946 r955  
    5151if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
    5252    $blogname = get_settings('blogname');
    53     $blogdescription = get_settings('blogdescription');
    5453    $admin_email = get_settings('admin_email');
    55     $new_users_can_blog = get_settings('new_users_can_blog');
    56     $users_can_register = get_settings('users_can_register');
    5754    $blog_charset = get_settings('blog_charset');
    5855    $start_of_week = get_settings('start_of_week');
    59     $use_bbcode = get_settings('use_bbcode');
    60     $use_gmcode = get_settings('use_gmcode');
    61     $use_quicktags = get_settings('use_quicktags');
    6256    $use_htmltrans = get_settings('use_htmltrans');
    6357    $use_balanceTags = get_settings('use_balanceTags');
Note: See TracChangeset for help on using the changeset viewer.