diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-29 10:04:55 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-29 10:04:55 +0000 |
| commit | 1da64f2d60f4b5e51370ebcded9fedd2d56e42e8 (patch) | |
| tree | 4684a85ec2380d4d569baeaa9a6ec4e3ab2a2f6a | |
| parent | a467a5c5984cc78cf369300153b751e4f0558f56 (diff) | |
| download | wordpress-mu-1da64f2d60f4b5e51370ebcded9fedd2d56e42e8.tar.gz wordpress-mu-1da64f2d60f4b5e51370ebcded9fedd2d56e42e8.tar.xz wordpress-mu-1da64f2d60f4b5e51370ebcded9fedd2d56e42e8.zip | |
Reverse [929] and update version
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@949 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | htaccess.dist | 4 | ||||
| -rw-r--r-- | wp-includes/version.php | 2 |
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; ?> |