From 37c361e964696d1b20cfccbbe3a9fb0848c16a92 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Sun, 29 Feb 2004 08:43:36 +0000
Subject: [PATCH] Migrating more of the global options to get_settings().

git-svn-id: https://develop.svn.wordpress.org/trunk@955 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-form-advanced.php            |  4 ++--
 wp-admin/edit-form-comment.php             |  4 ++--
 wp-admin/edit-form.php                     |  4 ++--
 wp-admin/upgrade-functions.php             |  1 +
 wp-admin/users.php                         |  1 +
 wp-includes/functions-formatting.php       | 13 ++-----------
 wp-includes/template-functions-general.php |  4 ++--
 wp-login.php                               |  2 +-
 wp-register.php                            |  3 ++-
 wp-settings.php                            |  6 ------
 10 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 82d39ed0bd..0ed3be7427 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -89,7 +89,7 @@ window.onload = focusit;
 <legend><a href="http://wordpress.org/docs/reference/post/#post" title="Help with post field">Post</a></legend>
 		<div id="quicktags">
 <?php
-if ($use_quicktags) {
+if ( get_settings('use_quicktags') ) {
 	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
 	include('quicktags.php');
 }
@@ -105,7 +105,7 @@ if ($use_quicktags) {
 </fieldset>
 
 <?php
-if ($use_quicktags) {
+if ( get_settings('use_quicktags') ) {
 ?>
 <script type="text/javascript" language="JavaScript">
 <!--
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 8863f92fb3..af3d8fbb09 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -43,7 +43,7 @@ window.onload = focusit;
 <legend>Comment</legend>
 		<div id="quicktags">
 <?php
-if ($use_quicktags) {
+if (get_settings('use_quicktags')) {
 	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
 	include('quicktags.php');
 }
@@ -59,7 +59,7 @@ if ($use_quicktags) {
 </fieldset>
 
 <?php
-if ($use_quicktags) {
+if (get_settings('use_quicktags')) {
 ?>
 <script type="text/javascript" language="JavaScript">
 <!--
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 24006d7a5d..726085ddfc 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -75,7 +75,7 @@ window.onload = focusit;
 <legend><a href="http://wordpress.org/docs/reference/post/#post" title="Help with post field">Post</a></legend>
 		<div id="quicktags">
 <?php
-if ($use_quicktags && 'bookmarklet' != $mode) {
+if (get_settings('use_quicktags') && 'bookmarklet' != $mode) {
 	echo '<a href="http://wordpress.org/docs/reference/post/#quicktags" title="Help with quicktags">Quicktags</a>: ';
 	include('quicktags.php');
 }
@@ -91,7 +91,7 @@ if ($use_quicktags && 'bookmarklet' != $mode) {
 </fieldset>
 
 <?php
-if ($use_quicktags) {
+if (get_settings('use_quicktags')) {
 ?>
 <script type="text/javascript" language="JavaScript">
 <!--
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 533c95e13a..54e8fee31f 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -707,6 +707,7 @@ function upgrade_110() {
 	}
 	
 	$wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 6");
+	$wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 7");
 
 	// Add blog_charset option
 	if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'blog_charset'")) {
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 71ed67c874..7b018017ca 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -70,6 +70,7 @@ case 'adduser':
 	$user_firstname = addslashes(stripslashes($user_firstname));
 	$user_lastname = addslashes(stripslashes($user_lastname));
 	$now = gmdate('Y-m-d H:i:s');
+	$new_users_can_blog = get_settings('new_users_can_blog');
 
 	$result = $wpdb->query("INSERT INTO $tableusers 
 		(user_login, user_pass, user_nickname, user_email, user_ip, user_domain, user_browser, dateYMDhour, user_level, user_idmode, user_firstname, user_lastname, user_nicename)
diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index ee2bdbdf8e..34423d7529 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -294,12 +294,7 @@ function make_clickable($text) { // original function: phpBB, extended here for
     return $ret;
 }
 
-function convert_bbcode($content) {
-	global $wp_bbcode, $use_bbcode;
-	if ($use_bbcode) {
-		$content = preg_replace($wp_bbcode["in"], $wp_bbcode["out"], $content);
-	}
-	$content = convert_bbcode_email($content);
+function convert_bbcode($content) { // depreciated
 	return $content;
 }
 
@@ -318,11 +313,7 @@ function convert_bbcode_email($content) {
 	return $content;
 }
 
-function convert_gmcode($content) {
-	global $wp_gmcode, $use_gmcode;
-	if ($use_gmcode) {
-		$content = preg_replace($wp_gmcode["in"], $wp_gmcode["out"], $content);
-	}
+function convert_gmcode($content) { // depreciated
 	return $content;
 }
 
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index 59a91e08ad..739f2016ab 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -22,7 +22,7 @@ function bloginfo_unicode($show='') {
 }
 
 function get_bloginfo($show='') {
-    global $blogname, $blogdescription, $admin_email;
+    global $blogname, $admin_email;
 
     $do_perma = 0;
     $feed_url = get_settings('siteurl');
@@ -39,7 +39,7 @@ function get_bloginfo($show='') {
             $output = get_settings('siteurl') .'/'. get_settings('blogfilename');
             break;
         case 'description':
-            $output = $blogdescription;
+            $output = get_settings('blogdescription');
             break;
         case 'rdf_url':
             $output = get_settings('siteurl') .'/wp-rdf.php';
diff --git a/wp-login.php b/wp-login.php
index faee9da029..a45ff1d83e 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -281,7 +281,7 @@ default:
 <div id="login">
 <p>
 	<a href="<?php echo get_settings('siteurl'); ?>" title="Are you lost?">Back to blog?</a><br />
-<?php if ($users_can_register) { ?>
+<?php if (get_settings('users_can_register')) { ?>
 	<a href="<?php echo get_settings('siteurl'); ?>/wp-register.php" title="Register to be an author">Register?</a><br />
 <?php } ?>
 	<a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=lostpassword" title="Password Lost and Found">Lost your password?</a>
diff --git a/wp-register.php b/wp-register.php
index f62d0077e3..65b9355d6c 100644
--- a/wp-register.php
+++ b/wp-register.php
@@ -34,7 +34,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 	}
 }
 
-if (!$users_can_register) {
+if (!get_settings('users_can_register')) {
 	$action = 'disabled';
 }
 
@@ -88,6 +88,7 @@ case 'register':
 	$pass1 = addslashes($pass1);
 	$user_nickname = addslashes($user_nickname);
 	$now = gmdate('Y-m-d H:i:s');
+	$new_users_can_blog = get_settings('new_users_can_blog');
 
 	$result = $wpdb->query("INSERT INTO $tableusers 
 		(user_login, user_pass, user_nickname, user_email, user_ip, user_domain, user_browser, dateYMDhour, user_level, user_idmode)
diff --git a/wp-settings.php b/wp-settings.php
index cbc47b08db..ef7a332798 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -50,15 +50,9 @@ require_once (ABSPATH . WPINC . '/kses.php');
 // accessing a single global $all_settings var
 if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
     $blogname = get_settings('blogname');
-    $blogdescription = get_settings('blogdescription');
     $admin_email = get_settings('admin_email');
-    $new_users_can_blog = get_settings('new_users_can_blog');
-    $users_can_register = get_settings('users_can_register');
     $blog_charset = get_settings('blog_charset');
     $start_of_week = get_settings('start_of_week');
-    $use_bbcode = get_settings('use_bbcode');
-    $use_gmcode = get_settings('use_gmcode');
-    $use_quicktags = get_settings('use_quicktags');
     $use_htmltrans = get_settings('use_htmltrans');
     $use_balanceTags = get_settings('use_balanceTags');
     $use_fileupload = get_settings('use_fileupload');