Skip to content

Commit

Permalink
CRM-12656
Browse files Browse the repository at this point in the history
----------------------------------------
* CRM-12656: Strict error notice in Joomla civicrmicon.php file
  http://issues.civicrm.org/jira/browse/CRM-12656
  • Loading branch information
Donald A. Lobo committed May 18, 2013
1 parent ad89e43 commit 3af05e5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions admin/configure.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand All @@ -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());
}
Expand Down
2 changes: 1 addition & 1 deletion admin/plugins/civicrm/civicrm.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion admin/plugins/civicrmicon/civicrmicon.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 3af05e5

Please sign in to comment.