Ticket #11884: wordpress.16670.patch

wp-includes/rewrite.php

@@ -1644 +1644 @@
                         $this->matches = '';
                         $rewrite = $this->rewrite_rules();
                         $num_rules = count($rewrite);
-                        $rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
+                        $rules .= "RewriteCond $1 ^(index\.php)?$ [OR]\n" .
+                                "RewriteCond $1 \.(gif|jpe?g|png|ico|css|js)$ [OR]\n" .
+                                "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
                                 "RewriteCond %{REQUEST_FILENAME} -d\n" .
-                                "RewriteRule ^.*$ - [S=$num_rules]\n";
+                                "RewriteRule (.*) - [S=$num_rules]\n";
 
                         foreach ( (array) $rewrite as $match => $query) {
                                 // Apache 1.3 does not support the reluctant (non-greedy) modifier.
@@ -1664 +1666 @@
                                         $rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
                         }
                 } else {
-                        $rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
+                        $rules .= "RewriteCond $1 !^(index\.php)?$\n" .
+                                "RewriteCond $1 !\.(gif|jpe?g|png|ico|css|js)$\n" .
+                                "RewriteCond %{REQUEST_FILENAME} !-f\n" .
                                 "RewriteCond %{REQUEST_FILENAME} !-d\n" .
-                                "RewriteRule . {$home_root}{$this->index} [L]\n";
+                                "RewriteRule (.+) {$home_root}{$this->index} [L]\n";
                 }
 
                 $rules .= "</IfModule>\n";