Changeset 4144 for trunk/wp-includes/functions.php

Timestamp:

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

Author:

ryan

Message:

Use get_option instead of get_settings. Just 'cause.

File:

• trunk/wp-includes/functions.php (modified) (13 diffs)

trunk/wp-includes/functions.php

@@ -46 +46 @@
                 case 'mysql':
                         if ( $gmt ) $d = gmdate('Y-m-d H:i:s');
-                        else $d = gmdate('Y-m-d H:i:s', (time() + (get_settings('gmt_offset') * 3600)));
+                        else $d = gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * 3600)));
                         return $d;
                         break;
                 case 'timestamp':
                         if ( $gmt ) $d = time();
-                        else $d = time() + (get_settings('gmt_offset') * 3600);
+                        else $d = time() + (get_option('gmt_offset') * 3600);
                         return $d;
                         break;
@@ -89 +89 @@
         $i = 86400;
 
-        if ( $weekday < get_settings('start_of_week') )
-                $weekday = 7 - (get_settings('start_of_week') - $weekday);
-
-        while ($weekday > get_settings('start_of_week')) {
+        if ( $weekday < get_option('start_of_week') )
+                $weekday = 7 - (get_option('start_of_week') - $weekday);
+
+        while ($weekday > get_option('start_of_week')) {
                 $weekday = date('w',$day);
-                if ( $weekday < get_settings('start_of_week') )
-                        $weekday = 7 - (get_settings('start_of_week') - $weekday);
+                if ( $weekday < get_option('start_of_week') )
+                        $weekday = 7 - (get_option('start_of_week') - $weekday);
 
                 $day = $day - 86400;
@@ -108 +108 @@
 function get_lastpostdate($timezone = 'server') {
         global $cache_lastpostdate, $pagenow, $wpdb;
-        $add_seconds_blog = get_settings('gmt_offset') * 3600;
+        $add_seconds_blog = get_option('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         if ( !isset($cache_lastpostdate[$timezone]) ) {
@@ -131 +131 @@
 function get_lastpostmodified($timezone = 'server') {
         global $cache_lastpostmodified, $pagenow, $wpdb;
-        $add_seconds_blog = get_settings('gmt_offset') * 3600;
+        $add_seconds_blog = get_option('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         if ( !isset($cache_lastpostmodified[$timezone]) ) {
@@ -165 +165 @@
 /* Options functions */
 
-function get_settings($setting) {
+function get_option($setting) {
         global $wpdb;
 
@@ -187 +187 @@
         // If home is not set use siteurl.
         if ( 'home' == $setting && '' == $value )
-                return get_settings('siteurl');
+                return get_option('siteurl');
 
         if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
@@ -193 +193 @@
 
         return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
-}
-
-function get_option($option) {
-        return get_settings($option);
 }
 
@@ -291 +287 @@
 
 function gzip_compression() {
-        if ( !get_settings('gzipcompression') ) return false;
+        if ( !get_option('gzipcompression') ) return false;
 
         if ( extension_loaded('zlib') ) {
@@ -325 +321 @@
                 $link_text = $matches[4][$i];
                 $content = str_replace($link_match, $link_text.' '.$link_number, $content);
-                $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_settings('home') . $link_url : $link_url;
+                $link_url = ((strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_option('home') . $link_url : $link_url;
                 $links_summary .= "\n".$link_number.' '.$link_url;
         }
@@ -882 +878 @@
 // Returns an array containing the current upload directory's path and url, or an error message.
 function wp_upload_dir() {
-        $siteurl = get_settings('siteurl');
+        $siteurl = get_option('siteurl');
         //prepend ABSPATH to $dir and $siteurl to $url if they're not already there
-        $path = str_replace(ABSPATH, '', trim(get_settings('upload_path')));
+        $path = str_replace(ABSPATH, '', trim(get_option('upload_path')));
         $dir = ABSPATH . $path;
         $url = trailingslashit($siteurl) . $path;
@@ -897 +893 @@
         }
 
-        if ( get_settings('uploads_use_yearmonth_folders')) {
+        if ( get_option('uploads_use_yearmonth_folders')) {
                 // Generate the yearly and monthly dirs
                 $time = current_time( 'mysql' );
@@ -1102 +1098 @@
         global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
 
-        $adminurl = get_settings('siteurl') . '/wp-admin';
+        $adminurl = get_option('siteurl') . '/wp-admin';
         if ( wp_get_referer() )
                 $adminurl = wp_get_referer();
@@ -1177 +1173 @@
 </head>
 <body>
-        <h1 id="logo"><img alt="WordPress" src="<?php echo get_settings('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
+        <h1 id="logo"><img alt="WordPress" src="<?php echo get_option('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
         <p><?php echo $message; ?></p>
 </body>