Merge pull request #7857 from eileenmcnaughton/CRM-18096

[civicrm-core.git] / bin / cli.class.php

diff --git a/bin/cli.class.php b/bin/cli.class.php
index a051135620f7c0e863bb042a5b174776d72ee010..dbcc5e9caf01268e28dc77b6e38b980b31863dbb 100644 (file)
--- a/bin/cli.class.php
+++ b/bin/cli.class.php
@@ -269,7 +269,7 @@ class civicrm_cli {
         $this->_log(ts("Failed to login as %1. Wrong username or password.", array('1' => $this->_user)));
         return FALSE;
       }
-      if (!$cms->loadUser($this->_user)) {
+      if (($this->_config->userFramework == 'Joomla' && !$cms->loadUser($this->_user, $this->_password)) || !$cms->loadUser($this->_user)) {
         $this->_log(ts("Failed to login as %1", array('1' => $this->_user)));
         return FALSE;
       }