Changeset 1377

Timestamp:

07/16/08 14:06:33 (5 months ago)

Author:

donncha

Message:

Don't redirect main blog 404s and unknown blogs to signup page by default.
Added "is_main_blog()" function
Redirect to NOBLOGREDIRECT on main blog 404 and unknown blog if that constant set, fixes #677

Files:

• trunk/wp-config-sample.php (modified) (1 diff)
• trunk/wp-includes/wpmu-functions.php (modified) (2 diffs)
• trunk/wpmu-settings.php (modified) (1 diff)

trunk/wp-config-sample.php

@@ -36 +36 @@
-//define( 'SUNRISE', 'on' );
-
-
-Browser will redirect to constant( 'NOBLOGREDICT' ) . "?new=blogname" where blogname is the unknown blog
+ or is a 404 on the main blog
+For example, browser will redirect to http://examples.com/ for the following: define( 'NOBLOGREDIRECT', 'http://example.com/' );
-// define( 'NOBLOGREDIRECT', '' );
-

trunk/wp-includes/wpmu-functions.php

@@ -99 +99 @@
-        global $wpdb;
-        return $wpdb->get_row( "SELECT * FROM $wpdb->users WHERE user_login = '$username'" );
+}
+
+function is_main_blog() {
+        global $current_blog, $current_site;
+        if( $current_blog->domain == $current_site->domain && $current_blog->path == $current_site->path )
+                return true;
+        return false;
-}
-
@@ -1962 +1969 @@
-add_filter( 'wpmu_validate_blog_signup', 'signup_nonce_check' );
-add_filter( 'wpmu_validate_user_signup', 'signup_nonce_check' );
+
+function maybe_redirect_404() {
+        global $wpdb;
+        if( is_main_blog() && is_404() && defined( 'NOBLOGREDIRECT' ) && constant( 'NOBLOGREDIRECT' ) != '' ) {
+                header( "Location: " . constant( 'NOBLOGREDIRECT' ) );
+                die();
+        }
+}
+add_action( 'template_redirect', 'maybe_redirect_404' );
-?>

trunk/wpmu-settings.php

@@ -104 +104 @@
-if( defined( "WP_INSTALLING" ) == false ) {
-        if( $current_site && $current_blog == null ) {
-
-
-
-
-
-
+
-        }
-        if( $current_blog == false || $current_site == false )