From c3be0a11d659db12432b26049cafa4fff182789f Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 8 Apr 2014 16:46:10 -0700 Subject: [PATCH] CRM_Utils_System_WordPress::url - Change code-branch for caes "isset($path)&&isset($query)" In the other usages of $script and $base, there's a decision to use $script XOR $base as the effective base-URL. However, in this branch, the values are concatenated to form the effective base-URL -- which shouldn't produce a valid base-URL. (Note: In this context, we're evaluating conditons of isset($path) and isset($query) which should have no bearing on the validity of $script or $base as a base-URL.) --- CRM/Utils/System/WordPress.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php index 389c2c0692..fb3f634f4b 100644 --- a/CRM/Utils/System/WordPress.php +++ b/CRM/Utils/System/WordPress.php @@ -336,7 +336,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { return $script . '?' . $query . $pageID . $fragment; } else { - return $base . $script . '?' . $query . $pageID . $fragment; + return $base . '?' . $query . $pageID . $fragment; } } else { -- 2.25.1