← Back to branch summary

~ubuntu-branches/debian/sid/wordpress/sid

« back to all changes in this revision

Viewing changes to wp-includes/ms-settings.php

  • Committer: Package Import Robot
  • Author(s): Craig Small
  • Date: 2014-06-11 22:33:48 UTC
  • mfrom: (1.2.36)
  • Revision ID: package-import@ubuntu.com-20140611223348-6c6cr7n694bz8p1g
Tags: 3.9.1+dfsg-1
http://bugs.debian.org/748965
* New upstream release
* Use system CA certificate file Closes: #748965

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/ms-settings.php
35
35
                $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
36
36
        }
37
37
 
38
 
        $path = strtolower( stripslashes( $_SERVER['REQUEST_URI'] ) );
 
38
        $path = stripslashes( $_SERVER['REQUEST_URI'] );
39
39
        if ( is_admin() ) {
40
40
                $path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
41
41
        }
53
53
                        $current_site->blog_id = BLOGID_CURRENT_SITE;
54
54
                }
55
55
 
56
 
                if ( $current_site->domain === $domain && $current_site->path === $path ) {
 
56
                if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
57
57
                        $current_blog = get_site_by_path( $domain, $path );
58
 
                } elseif ( '/' !== $current_site->path && $current_site->domain === $domain && 0 === strpos( $path, $current_site->path ) ) {
 
58
                } elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
59
59
                        // If the current network has a path and also matches the domain and path of the request,
60
60
                        // we need to look for a site using the first path segment following the network's path.
61
61
                        $current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );