Changeset 13209

Timestamp:

02/19/2010 01:03:58 AM (15 years ago)

Author:

nacin

Message:

Assume WP_DEBUG is defined in wpdb. Remove unnecessary constant() calls. Ensure DB_COLLATE defined as empty string doesn't override default Multisite collation. fixes #12041, see #11644

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/revision.php (modified) (4 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/ms-load.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/template-loader.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (4 diffs)

trunk/wp-admin/includes/ms.php

@@ -76 +76 @@
         }
         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id) );
-        $dir = apply_filters( 'wpmu_delete_blog_upload_dir', constant( "WP_CONTENT_DIR" ) . "/blogs.dir/{$blog_id}/files/", $blog_id );
+        $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
         $dir = rtrim($dir, DIRECTORY_SEPARATOR);
         $top_dir = $dir;

trunk/wp-admin/includes/upgrade.php

@@ -1260 +1260 @@
 
     if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
-        return preg_replace( '|/+$|', '', constant( 'WP_HOME' ) );
+        return preg_replace( '|/+$|', '', WP_HOME );
     }
 
     if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
-        return preg_replace( '|/+$|', '', constant( 'WP_SITEURL' ) );
+        return preg_replace( '|/+$|', '', WP_SITEURL );
     }
 

trunk/wp-admin/revision.php

@@ -30 +30 @@
         break;
 
-    if ( !constant('WP_POST_REVISIONS') && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
+    if ( ! WP_POST_REVISIONS && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
         break;
 
@@ -69 +69 @@
         break; // Don't diff two unrelated revisions
 
-    if ( !constant('WP_POST_REVISIONS') ) { // Revisions disabled
+    if ( ! WP_POST_REVISIONS ) { // Revisions disabled
         if (
             // we're not looking at an autosave
@@ -107 +107 @@
         break;
 
-    if ( !constant('WP_POST_REVISIONS') && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
+    if ( ! WP_POST_REVISIONS && !wp_is_post_autosave( $revision ) ) // Revisions disabled and we're not looking at an autosave
         break;
 
@@ -208 +208 @@
 
 $args = array( 'format' => 'form-table', 'parent' => true, 'right' => $right, 'left' => $left );
-if ( !constant( 'WP_POST_REVISIONS' ) )
+if ( ! WP_POST_REVISIONS )
     $args['type'] = 'autosave';
 

trunk/wp-includes/ms-functions.php

@@ -1275 +1275 @@
 function maybe_redirect_404() {
     global $current_site;
-    if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
-        $destination = constant( 'NOBLOGREDIRECT' );
+    if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = NOBLOGREDIRECT ) ) {
         if ( $destination == '%siteurl%' )
             $destination = $current_site->domain . $current_site->path;

trunk/wp-includes/ms-load.php

@@ -99 +99 @@
     global $wpdb, $current_site, $domain, $path, $sites, $cookie_domain;
     if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
-        $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1);
+        $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
         $current_site->domain = DOMAIN_CURRENT_SITE;
         $current_site->path   = $path = PATH_CURRENT_SITE;

trunk/wp-includes/post.php

@@ -4170 +4170 @@
 
     // WP_POST_REVISIONS = 0, false
-    if ( !constant('WP_POST_REVISIONS') )
+    if ( ! WP_POST_REVISIONS )
         return;
 
@@ -4449 +4449 @@
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
-    if ( !constant('WP_POST_REVISIONS') )
+    if ( ! WP_POST_REVISIONS )
         return array();
     if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )

trunk/wp-includes/template-loader.php

@@ -4 +4 @@
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
+if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) {
     do_action('template_redirect');
     if ( is_robots() ) {

trunk/wp-includes/wp-db.php

@@ -346 +346 @@
      */
     function wpdb($dbuser, $dbpassword, $dbname, $dbhost) {
-        if( defined( "WP_USE_MULTIPLE_DB" ) && CONSTANT( "WP_USE_MULTIPLE_DB" ) == true )
+        if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB )
             $this->db_connect();
         return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
@@ -368 +368 @@
         register_shutdown_function(array(&$this, "__destruct"));
 
-        if ( defined( 'WP_DEBUG' ) && WP_DEBUG )
+        if ( WP_DEBUG )
             $this->show_errors();
 
         if ( is_multisite() ) {
             $this->charset = 'utf8';
-            if ( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' )
-                $this->collate = constant( 'DB_COLLATE' );
+            if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
+                $this->collate = DB_COLLATE;
             else
                 $this->collate = 'utf8_general_ci';
+        } elseif ( defined( 'DB_COLLATE' ) ) {
+            $this->collate = DB_COLLATE;
         }
 
         if ( defined('DB_CHARSET') )
             $this->charset = DB_CHARSET;
-
-        if ( defined('DB_COLLATE') )
-            $this->collate = DB_COLLATE;
 
         $this->dbuser = $dbuser;
@@ -667 +666 @@
             $msg = "WordPress database error: [$str]\n{$this->last_query}\n";
             if ( defined( 'ERRORLOGFILE' ) )
-                error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
+                error_log( $msg, 3, ERRORLOGFILE );
             if ( defined( 'DIEONDBERROR' ) )
                 die( $msg );
@@ -808 +807 @@
         // use $this->dbhglobal for gloal table ops
         unset( $dbh );
-        if( defined( "WP_USE_MULTIPLE_DB" ) && CONSTANT( "WP_USE_MULTIPLE_DB" ) == true ) {
+        if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB ) {
             if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
                 if( false == isset( $this->dbhglobal ) ) {