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

Timestamp:

04/20/2004 10:56:47 PM (22 years ago)

Author:

saxmatt

Message:

Changed to superglobals, and eliminated $use_cache (since we always do).

File:

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

trunk/wp-includes/functions.php

@@ -99 +99 @@
 
 function get_lastpostdate($timezone = 'server') {
-        global $tableposts, $cache_lastpostdate, $use_cache, $pagenow, $wpdb;
+        global $tableposts, $cache_lastpostdate, $pagenow, $wpdb;
         $add_seconds_blog = get_settings('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         $now = current_time('mysql', 1);
-        if ((!isset($cache_lastpostdate[$timezone])) OR (!$use_cache)) {
+        if ( !isset($cache_lastpostdate[$timezone]) ) {
                 switch(strtolower($timezone)) {
                         case 'gmt':
@@ -123 +123 @@
 
 function get_lastpostmodified($timezone = 'server') {
-        global $tableposts, $cache_lastpostmodified, $use_cache, $pagenow, $wpdb;
+        global $tableposts, $cache_lastpostmodified, $pagenow, $wpdb;
         $add_seconds_blog = get_settings('gmt_offset') * 3600;
         $add_seconds_server = date('Z');
         $now = current_time('mysql', 1);
-        if ((!isset($cache_lastpostmodified[$timezone])) OR (!$use_cache)) {
+        if ( !isset($cache_lastpostmodified[$timezone]) ) {
                 switch(strtolower($timezone)) {
                         case 'gmt':
@@ -151 +151 @@
 
 function user_pass_ok($user_login,$user_pass) {
-        global $cache_userdata,$use_cache;
-        if ((empty($cache_userdata[$user_login])) OR (!$use_cache)) {
+        global $cache_userdata;
+        if ( empty($cache_userdata[$user_login]) ) {
                 $userdata = get_userdatabylogin($user_login);
         } else {
@@ -174 +174 @@
 
 function get_userdata($userid) {
-        global $wpdb, $cache_userdata, $use_cache, $tableusers;
-        if ((empty($cache_userdata[$userid])) || (!$use_cache)) {
+        global $wpdb, $cache_userdata, $tableusers;
+        if ( empty($cache_userdata[$userid]) ) {
                 $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID = '$userid'");
         $user->user_nickname = stripslashes($user->user_nickname);
@@ -191 +191 @@
 
 function get_userdatabylogin($user_login) {
-        global $tableusers, $cache_userdata, $use_cache, $wpdb;
-        if ((empty($cache_userdata["$user_login"])) OR (!$use_cache)) {
+        global $tableusers, $cache_userdata, $wpdb;
+        if ( empty($cache_userdata["$user_login"]) ) {
                 $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE user_login = '$user_login'");
                 $cache_userdata["$user_login"] = $user;
@@ -202 +202 @@
 
 function get_userid($user_login) {
-        global $tableusers, $cache_userdata, $use_cache, $wpdb;
-        if ((empty($cache_userdata["$user_login"])) OR (!$use_cache)) {
+        global $tableusers, $cache_userdata, $wpdb;
+        if ( empty($cache_userdata["$user_login"]) ) {
                 $user_id = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_login = '$user_login'");
 
@@ -294 +294 @@
 
 function get_settings($setting) {
-        global $wpdb, $cache_settings, $use_cache;
+        global $wpdb, $cache_settings;
         if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
                 return false;
@@ -302 +302 @@
         $setting = str_replace('time_difference', 'gmt_offset', $setting);
 
-        if ((empty($cache_settings)) OR (!$use_cache)) {
+        if ( (empty($cache_settings)) ) {
                 $settings = get_alloptions();
                 $cache_settings = $settings;
@@ -348 +348 @@
                 $wpdb->query("INSERT INTO $tableoptions (option_name, option_value) VALUES ('$name', '$value')");
 
-                global $use_cache;
-                if($wpdb->insert_id && $use_cache) {
+                if($wpdb->insert_id) {
                         global $cache_settings;
                         $cache_settings->{$name} = $value;
@@ -413 +412 @@
 
 function get_catname($cat_ID) {
-        global $tablecategories,$cache_catnames,$use_cache, $wpdb;
-        if ((!$cache_catnames) || (!$use_cache)) {
+        global $tablecategories, $cache_catnames, $wpdb;
+        if ( !$cache_catnames) ) {
         $results = $wpdb->get_results("SELECT * FROM $tablecategories") or die('Oops, couldn\'t query the db for categories.');
                 foreach ($results as $post) {
@@ -475 +474 @@
                         }
                 } else if($phpver > "4.0") {
-                        if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip')) {
+                        if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')) {
                                 if(extension_loaded("zlib")) { 
                                         $do_gzip_compress = TRUE; 
@@ -1003 +1002 @@
 
         if ('' == $comment->comment_author_email || '' == $comment->comment_author) {
-                $from = "From: \"$blogname\" <wordpress@" . $HTTP_SERVER_VARS['SERVER_NAME'] . '>';
+                $from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
         } else {
                 $from = 'From: "' . stripslashes($comment->comment_author) . "\" <$comment->comment_author_email>";
@@ -1062 +1061 @@
         global $preview_userid,$preview_date,$preview_content,$preview_title,$preview_category,$preview_notify,$preview_make_clickable,$preview_autobr;
         global $pagenow;
-        global $HTTP_GET_VARS;
         if (!$preview) {
                 $id = $post->ID;
@@ -1069 +1067 @@
                 $postdata = array (
                         'ID' => 0,
-                        'Author_ID' => $HTTP_GET_VARS['preview_userid'],
-                        'Date' => $HTTP_GET_VARS['preview_date'],
-                        'Content' => $HTTP_GET_VARS['preview_content'],
-                        'Excerpt' => $HTTP_GET_VARS['preview_excerpt'],
-                        'Title' => $HTTP_GET_VARS['preview_title'],
-                        'Category' => $HTTP_GET_VARS['preview_category'],
+                        'Author_ID' => $_GET['preview_userid'],
+                        'Date' => $_GET['preview_date'],
+                        'Content' => $_GET['preview_content'],
+                        'Excerpt' => $_GET['preview_excerpt'],
+                        'Title' => $_GET['preview_title'],
+                        'Category' => $_GET['preview_category'],
                         'Notify' => 1
                         );