Changeset 4144 for trunk/wp-settings.php

Timestamp:

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

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

File:

• trunk/wp-settings.php (modified) (3 diffs)

trunk/wp-settings.php

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