From 2d8f9c75ccb8485e22dbdea71756f9f02beb81c4 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Mon, 4 Nov 2013 15:56:42 -0800
Subject: [PATCH] fix notices
---
CRM/Utils/System/Joomla.php | 4 ++--
bin/cli.class.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php
index fb7a0fc453..0f635aacb8 100644
--- a/CRM/Utils/System/Joomla.php
+++ b/CRM/Utils/System/Joomla.php
@@ -471,7 +471,7 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
jimport('joomla.application.component.helper');
jimport('joomla.database.table');
- $JUserTable = &JTable::getInstance('User', 'JTable');
+ $JUserTable = JTable::getInstance('User', 'JTable');
$db = $JUserTable->getDbo();
$query = $db->getQuery(TRUE);
@@ -526,7 +526,7 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
function setUserSession($data) {
list($userID, $ufID) = $data;
$user = new JUser( $ufID );
- $session = &JFactory::getSession();
+ $session = JFactory::getSession();
$session->set('user', $user);
parent::setUserSession($data);
diff --git a/bin/cli.class.php b/bin/cli.class.php
index cad7f6ce3c..ec420a6c53 100644
--- a/bin/cli.class.php
+++ b/bin/cli.class.php
@@ -51,6 +51,7 @@ class civicrm_cli {
// optional arguments
var $_site = 'localhost';
var $_user = NULL;
+ var $_password = NULL;
// all other arguments populate the parameters
// array that is passed to civicrm_api
@@ -366,7 +367,7 @@ class civicrm_cli_csv_file extends civicrm_cli {
function convertLine($data) {
$params = array();
foreach ($this->header as $i => $field) {
- //split any multiselect data, denoted with CRM_Core_DAO::VALUE_SEPARATOR
+ //split any multiselect data, denoted with CRM_Core_DAO::VALUE_SEPARATOR
if (strpos($data[$i], CRM_Core_DAO::VALUE_SEPARATOR) !== FALSE) {
$data[$i] = explode(CRM_Core_DAO::VALUE_SEPARATOR,$data[$i]);
$data[$i] = array_combine($data[$i], $data[$i]);
--
2.25.1