← Back to branch summary

~canonical-sysadmins/wordpress/4.7.2

« back to all changes in this revision

Viewing changes to wp-admin/includes/misc.php

  • Committer: Barry Price
  • Date: 2016-04-27 04:42:45 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: barry.price@canonical.com-20160427044245-ob1jzpeq2ex7jv07
Merge WP 4.5.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/misc.php
491
491
        if ( $doc->load($filename) === false )
492
492
                return false;
493
493
        $xpath = new DOMXPath($doc);
494
 
        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 
494
        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
495
495
        if ( $rules->length == 0 )
496
496
                return false;
497
497
        else
521
521
        if ( $doc -> load($filename) === false )
522
522
                return false;
523
523
        $xpath = new DOMXPath($doc);
524
 
        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 
524
        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
525
525
        if ( $rules->length > 0 ) {
526
526
                $child = $rules->item(0);
527
527
                $parent = $child->parentNode;
562
562
        $xpath = new DOMXPath($doc);
563
563
 
564
564
        // First check if the rule already exists as in that case there is no need to re-add it
565
 
        $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 
565
        $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
566
566
        if ( $wordpress_rules->length > 0 )
567
567
                return true;
568
568