Changeset 37274

Timestamp:

04/21/2016 09:36:50 AM (10 years ago)

Author:

ocean90

Message:

Rewrite Rules: After [36953], correctly replace existing rules on IIS when updating them.

Merge of [37273] to the 4.5 branch.

Props WiZZarD_.
Fixes #36506.

File:

• branches/4.5/src/wp-admin/includes/misc.php (modified) (3 diffs)

branches/4.5/src/wp-admin/includes/misc.php

@@ -492 +492 @@
                 return false;
         $xpath = new DOMXPath($doc);
-        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
+        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
         if ( $rules->length == 0 )
                 return false;
@@ -522 +522 @@
                 return false;
         $xpath = new DOMXPath($doc);
-        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
+        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
         if ( $rules->length > 0 ) {
                 $child = $rules->item(0);
@@ -563 +563 @@
 
         // First check if the rule already exists as in that case there is no need to re-add it
-        $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
+        $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
         if ( $wordpress_rules->length > 0 )
                 return true;