summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--htaccess.dist4
-rw-r--r--wp-includes/version.php2
2 files changed, 1 insertions, 5 deletions
diff --git a/htaccess.dist b/htaccess.dist
index 7e5f5e7..0f14905 100644
--- a/htaccess.dist
+++ b/htaccess.dist
@@ -9,10 +9,6 @@ RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L]
RewriteCond %{REQUEST_FILENAME} -f [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule . - [L]
-RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-.*) $2 [L]
-RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
RewriteRule . index.php [L]
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 26435a2..5355c5c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -2,7 +2,7 @@
// This holds the version number in a separate file so we can bump it without cluttering the SVN
-$wp_version = 'wordpress-mu-1.1.1'; // Let's just avoid confusion
+$wp_version = 'wordpress-mu-1.2.1'; // Let's just avoid confusion
$wp_db_version = 4860;
?>