Merge pull request #8494 from kcristiano/CRM-18221

CRM-18221 filter relativize with realpath function to properly configure [civicrm.root] and [civicrm.files] on hosts with symlinked file systems

CRM/Utils/System/WordPress.php

@@ -112,8 +112,7 @@ public function getCiviSourceStorage() {
     if (CRM_Utils_System::isSSL()) {
       $cmsUrl = str_replace('http://', 'https://', $cmsUrl);
     }
-
-    $civiRelPath = CRM_Utils_File::relativize($civicrm_root, $cmsPath);
+    $civiRelPath = CRM_Utils_File::relativize(realpath($civicrm_root), realpath($cmsPath));
     $civiUrl = rtrim($cmsUrl, '/') . '/' . ltrim($civiRelPath, ' /');
     return array(
       'url' => CRM_Utils_File::addTrailingSlash($civiUrl, '/'),
@@ -212,8 +211,9 @@ public function url(
 
     //this means wp function we are trying to use is not available,
     //so load bootStrap
+    // FIXME: Why bootstrap in url()? Generally want to define 1-2 strategic places to put bootstrap
     if (!function_exists('get_option')) {
-      $this->loadBootStrap(); // FIXME: Why bootstrap in url()? Generally want to define 1-2 strategic places to put bootstrap
+      $this->loadBootStrap();
     }
     if ($config->userFrameworkFrontend) {
       if (get_option('permalink_structure') != '') {
@@ -435,7 +435,7 @@ public function loadBootStrap($name = NULL, $pass = NULL) {
       $name = $name ? $name : trim(CRM_Utils_Array::value('name', $_REQUEST));
       $pass = $pass ? $pass : trim(CRM_Utils_Array::value('pass', $_REQUEST));
       if ($name) {
-        $uid = wp_authenticate($name, $pass); // this returns a WP_User object if successful
+        $uid = wp_authenticate($name, $pass);
         if (!$uid) {
           if ($throwError) {
             echo '<br />Sorry, unrecognized username or password.';