CRM-12656

Donald A. Lobo · Donald A. Lobo · commit 3af05e58114a · 2013-05-18T10:40:10.000-07:00
---------------------------------------- * CRM-12656: Strict error notice in Joomla civicrmicon.php file http://issues.civicrm.org/jira/browse/CRM-12656
diff --git a/admin/configure.php b/admin/configure.php
@@ -171,7 +171,7 @@ function civicrm_source($fileName, $lineMode = FALSE) {
     foreach ($queries as $query) {
       $query = trim($query);
       if (!empty($query)) {
-        $res = &$db->query($query);
+        $res =& $db->query($query);
         if (PEAR::isError($res)) {
           die("Cannot execute $query: " . $res->getMessage());
         }
@@ -185,7 +185,7 @@ function civicrm_source($fileName, $lineMode = FALSE) {
       $string = ereg_replace("\n\-\-[^\n]*\n", "\n", $string);
       $string = trim($string);
       if (!empty($string)) {
-        $res = &$db->query($string);
+        $res =& $db->query($string);
         if (PEAR::isError($res)) {
           die("Cannot execute $string: " . $res->getMessage());
         }
diff --git a/admin/plugins/civicrm/civicrm.php b/admin/plugins/civicrm/civicrm.php
@@ -84,7 +84,7 @@ function onUserAfterDelete($user, $succes, $msg) {
   public function onUserLogin($user, $options = array()) {
     $app  = JFactory::getApplication();
     if ( $app->isAdmin() ) {
-      $jUser =& JFactory::getUser();
+      $jUser = JFactory::getUser();
       $jId = $jUser->get('id');
       self::civicrmResetNavigation( $jId );
     }
diff --git a/admin/plugins/civicrmicon/civicrmicon.php b/admin/plugins/civicrmicon/civicrmicon.php
@@ -56,7 +56,7 @@ public function onGetIcons($context) {
           background-image:url("'.$img.'");
         }
       ';
-      $document =& JFactory::getDocument();
+      $document = JFactory::getDocument();
       $document->addStyleDeclaration( $css );
       $icon[0]['image'] = 'civicrm';
     } else {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ function onUserAfterDelete($user, $succes, $msg) {`
`84`	`84`	`public function onUserLogin($user, $options = array()) {`
`85`	`85`	`$app = JFactory::getApplication();`
`86`	`86`	`if ( $app->isAdmin() ) {`
`87`		`- $jUser =& JFactory::getUser();`
	`87`	`+ $jUser = JFactory::getUser();`
`88`	`88`	`$jId = $jUser->get('id');`
`89`	`89`	`self::civicrmResetNavigation( $jId );`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function onGetIcons($context) {`
`56`	`56`	`background-image:url("'.$img.'");`
`57`	`57`	`}`
`58`	`58`	`';`
`59`		`- $document =& JFactory::getDocument();`
	`59`	`+ $document = JFactory::getDocument();`
`60`	`60`	`$document->addStyleDeclaration( $css );`
`61`	`61`	`$icon[0]['image'] = 'civicrm';`
`62`	`62`	`} else {`