Merge pull request #14948 from civicrm/5.16

[civicrm-core.git] / CRM / Utils / System / WordPress.php

diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index a74e1e3de02b4d216b5c2a29d7ccb141d4528498..bf35954360efa02b4711d693867b1103ffcc9a9d 100644 (file)
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -270,11 +270,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
       // pre-existing logic
       if (isset($path)) {
         $queryParts[] = 'page=CiviCRM';
-        // Encode all but the *path* placeholder
-        if ($path !== '*path*') {
-          $path = rawurlencode($path);
-        }
-        $queryParts[] = "q={$path}";
+        $queryParts[] = 'q=' . rawurlencode($path);
       }
       if ($wpPageParam) {
         $queryParts[] = $wpPageParam;