Merge pull request #1899 from dlobo/CRM-13697

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

diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index e38c63dc8a7d099bc7d95d522c3f1151927c54a9..42649a736d038fa008e3e9fdc450a767d871cea2 100644 (file)
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -315,18 +315,18 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
     if (isset($path)) {
       if (isset($query)) {
         if ($permlinkStructure != '' && ($pageID || $script != '')) {
-          return $script . '?page=CiviCRM&q=' . $path . $pageID . $separator . $query . $fragment;
+          return $script . '?page=CiviCRM'. $separator . 'q=' . $path . $pageID . $separator . $query . $fragment;
         }
         else {
-          return $base . '?page=CiviCRM&q=' . $path . $pageID . $separator . $query . $fragment;
+          return $base . '?page=CiviCRM' . $separator . 'q=' . $path . $pageID . $separator . $query . $fragment;
         }
       }
       else {
         if ($permlinkStructure != '' && ($pageID || $script != '')) {
-          return $script . '?page=CiviCRM&q=' . $path . $pageID . $fragment;
+          return $script . '?page=CiviCRM' . $separator . 'q=' . $path . $pageID . $fragment;
         }
         else {
-          return $base .'?page=CiviCRM&q=' . $path . $pageID . $fragment;
+          return $base . '?page=CiviCRM' . $separator . 'q=' . $path . $pageID . $fragment;
         }
       }
     }