CRM-13007 fix
authorPratik Joshi <pratik.joshi@webaccess.co.in>
Mon, 8 Jul 2013 08:08:17 +0000 (13:38 +0530)
committerPratik Joshi <pratik.joshi@webaccess.co.in>
Mon, 8 Jul 2013 08:08:17 +0000 (13:38 +0530)
CRM/Utils/SoapServer.php
CRM/Utils/System/WordPress.php

index 8a580d30826dbae895c24eb2301c71fdfbab6418..a0c39fedf7d019b7d94e98d9b3f1fd7d28b60cb6 100644 (file)
@@ -124,9 +124,9 @@ class CRM_Utils_SoapServer {
    */
   public function authenticate($name, $pass, $loadCMSBootstrap = FALSE) {
     require_once (str_replace('_', DIRECTORY_SEPARATOR, $this->ufClass) . '.php');
-        
-    if ($this->ufClass == 'CRM_Utils_System_Joomla'){
-      $loadCMSBootstrap = true;
+
+    if ($this->ufClass == 'CRM_Utils_System_Joomla' || $this->ufClass == 'CRM_Utils_System_WordPress'){
+      $loadCMSBootstrap = TRUE;
     }
         
     eval('$result =& ' . $this->ufClass . '::authenticate($name, $pass, $loadCMSBootstrap );');
index 3a840ddeb0b90fd4aa9a6b8b17e338cf2cb8eae0..e38c63dc8a7d099bc7d95d522c3f1151927c54a9 100644 (file)
@@ -361,7 +361,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
     $config = CRM_Core_Config::singleton();
 
     if ($loadCMSBootstrap) {
-      self::loadBootstrap($name, $password);
+      $config->userSystem->loadBootStrap($name, $password);
     }
 
     $user = wp_authenticate($name, $password);