diff options
| -rw-r--r-- | wp-config-sample.php | 6 | ||||
| -rw-r--r-- | wp-settings.php | 9 | ||||
| -rw-r--r-- | wpmu-settings.php | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/wp-config-sample.php b/wp-config-sample.php index 4ce2736..d64bcea 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -18,8 +18,10 @@ $table_prefix = 'wp_'; // Only numbers, letters, and underscores please! // Change this to localize WordPress. A corresponding MO file for the
// chosen language must be installed to wp-content/languages.
// For example, install de.mo to wp-content/languages and set WPLANG to 'de'
-// to enable German language support.
-define ('WPLANG', '');
+// to enable language support.
+define('WPLANG', '');
+// uncomment this to enable wp-content/sunrise.php support
+//define( 'SUNRISE', 'on' );
define( "WP_USE_MULTIPLE_DB", false );
diff --git a/wp-settings.php b/wp-settings.php index 9fa1350..e57af7e 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -125,6 +125,9 @@ $wpdb->blog_versions = $wpdb->prefix . 'blog_versions'; $wpdb->users = $wpdb->prefix . 'users'; $wpdb->usermeta = $wpdb->prefix . 'usermeta'; +if( defined( 'SUNRISE' ) ) + include_once( ABSPATH . 'wp-content/sunrise.php' ); + require_once ( ABSPATH . 'wpmu-settings.php' ); $wpdb->prefix = $table_prefix; $wpdb->posts = $wpdb->prefix . 'posts'; @@ -136,8 +139,8 @@ $wpdb->links = $wpdb->prefix . 'links'; $wpdb->linkcategories = $wpdb->prefix . 'linkcategories'; $wpdb->options = $wpdb->prefix . 'options'; $wpdb->postmeta = $wpdb->prefix . 'postmeta'; -$wpdb->siteid = $site_id; -$wpdb->blogid = $blog_id; +$wpdb->siteid = $current_blog->site_id; +$wpdb->blogid = $current_blog->blog_id; if ( defined('CUSTOM_USER_TABLE') ) $wpdb->users = CUSTOM_USER_TABLE; @@ -333,4 +336,4 @@ register_shutdown_function('shutdown_action_hook'); // Everything is loaded and initialized. do_action('init'); -?>
\ No newline at end of file +?> diff --git a/wpmu-settings.php b/wpmu-settings.php index 06ba9dd..38c7b36 100644 --- a/wpmu-settings.php +++ b/wpmu-settings.php @@ -1,6 +1,6 @@ <?php
-if( defined( 'ABSPATH' ) == false )
- die();
+if( $current_site && $current_blog )
+ return;
$wpmuBaseTablePrefix = $table_prefix;
|