summaryrefslogtreecommitdiffstats
path: root/wp-inst
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-08-11 17:02:46 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-08-11 17:02:46 +0000
commitc369a852d2a5cbfeff53517449abe1804c33f937 (patch)
treebd889cf11ad658f42d98935b6a808a3f31609c94 /wp-inst
parent40ca76944e876d6f8b1383f06d60daddf07ee4d8 (diff)
downloadwordpress-mu-c369a852d2a5cbfeff53517449abe1804c33f937.tar.gz
wordpress-mu-c369a852d2a5cbfeff53517449abe1804c33f937.tar.xz
wordpress-mu-c369a852d2a5cbfeff53517449abe1804c33f937.zip
Make wpmu a little more generic
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@167 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst')
-rw-r--r--wp-inst/wp-admin/upgrade-schema.php4
-rw-r--r--wp-inst/wp-content/mu-plugins/bad-behavior-wordpress.php2
-rw-r--r--wp-inst/wp-content/mu-plugins/blogs-header.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/wp-inst/wp-admin/upgrade-schema.php b/wp-inst/wp-admin/upgrade-schema.php
index 49e8f77..a111773 100644
--- a/wp-inst/wp-admin/upgrade-schema.php
+++ b/wp-inst/wp-admin/upgrade-schema.php
@@ -184,12 +184,12 @@ CREATE TABLE $wpdb->sitecategories (
";
function populate_options() {
- global $wpdb, $wpblog;
+ global $wpdb, $wpblog, $current_site;
$guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
add_option('siteurl', $guessurl, __('WordPress web address'));
add_option('blogname', __('My Weblog'), __('Blog title'));
- add_option('blogdescription', __('Just another WordPress.com weblog'), __('Short tagline'));
+ add_option('blogdescription', __('Just another ' . $current_site->site_name . ' weblog'), __('Short tagline'));
add_option('new_users_can_blog', 0);
add_option('users_can_register', 0);
add_option('admin_email', 'you@example.com');
diff --git a/wp-inst/wp-content/mu-plugins/bad-behavior-wordpress.php b/wp-inst/wp-content/mu-plugins/bad-behavior-wordpress.php
index c38c228..d4989b4 100644
--- a/wp-inst/wp-content/mu-plugins/bad-behavior-wordpress.php
+++ b/wp-inst/wp-content/mu-plugins/bad-behavior-wordpress.php
@@ -49,7 +49,7 @@ $wp_bb_logging_duration = 7;
// be exposed to spammers! Bad Behavior will munge it automatically; you
// should NOT munge it here!
#$wp_bb_email = get_bloginfo('admin_email');
-$wp_bb_email = "wordpress@wordpress.com";
+$wp_bb_email = "wordpress@" . $current_site->domain;
// The database table name to use.
// You can customize the table name if necessary.
diff --git a/wp-inst/wp-content/mu-plugins/blogs-header.php b/wp-inst/wp-content/mu-plugins/blogs-header.php
index a50a524..48522cd 100644
--- a/wp-inst/wp-content/mu-plugins/blogs-header.php
+++ b/wp-inst/wp-content/mu-plugins/blogs-header.php
@@ -4,7 +4,7 @@ add_action('wp_footer', "blogs_header" );
function blogs_header() {
global $current_site;
- print "<div style='position: absolute; top: 0px; width: 100%; background: #eee; border-bottom: 1px solid #333;'><table width='100%' border=0 cellspacing=0 cellpadding=0><td align='left'><a href='http://www.wordpress.com'>WordPress.com</a></td><td align='right'><a href='http://" . $current_site->domain . $current_site->path . "wp-newblog.php'>Get Your Own Blog</a></td></table></div>";
+ print "<div style='position: absolute; top: 0px; width: 100%; background: #eee; border-bottom: 1px solid #333;'><table width='100%' border=0 cellspacing=0 cellpadding=0><td align='left'><a href='http://" . $current_site->domain . $current_site->path . "'>" . $current_site->site_name . "</a></td><td align='right'><a href='http://" . $current_site->domain . $current_site->path . "wp-newblog.php'>Get Your Own Blog</a></td></table></div>";
}
*/