Changeset 13209 for trunk/wp-includes/ms-functions.php

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

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

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;