Changeset 8335 for branches/crazyhorse/wp-includes/functions.php

Timestamp:

07/15/2008 02:01:08 AM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8240:8334

File:

• branches/crazyhorse/wp-includes/functions.php (modified) (4 diffs)

branches/crazyhorse/wp-includes/functions.php

@@ -491 +491 @@
         $newvalue = sanitize_option( $option_name, $newvalue );
 
+        $oldvalue = get_option( $safe_option_name );
+
+        $newvalue = apply_filters( 'pre_update_option_' . $option_name, $newvalue, $oldvalue );
+
         // If the new and old values are the same, no need to update.
-        $oldvalue = get_option( $safe_option_name );
         if ( $newvalue === $oldvalue )
                 return false;
@@ -1493 +1496 @@
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
-        
+
+        $bdir = $dir; 
+        $burl = $url;
+
         $subdir = '';
         if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
@@ -1513 +1519 @@
         }
 
-        $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'error' => false );
+        $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
         return apply_filters( 'upload_dir', $uploads );
 }
@@ -2254 +2260 @@
  */
 function is_ssl() {
-        return ( 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
+        return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
 }