From 1c6d05282c47af9a94cbdb3f87d35b3ac5378e00 Mon Sep 17 00:00:00 2001 From: Conrad Vermeulen Date: Mon, 5 Mar 2007 10:46:52 +0000 Subject: [PATCH] KTS-1778 "PHP5 array_merge produces warnings with dashlet display fix" Fixed. --- lib/users/User.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/users/User.inc b/lib/users/User.inc index 60f11d1..a8c6a4a 100644 --- a/lib/users/User.inc +++ b/lib/users/User.inc @@ -187,6 +187,9 @@ class User extends KTEntity { $state = $this->getDashboardState(); $dashlets = $oJSON->decode($state); + + if (!isset($dashlets->left)) $dashlets->left = array(); + if (!isset($dashlets->right)) $dashlets->right = array(); $mergedlist = array_merge($dashlets->left,$dashlets->right); @@ -197,8 +200,8 @@ class User extends KTEntity { } $update=false; - if (!isset($dashlets->left)) $dashlets->left=array(); - if (!isset($dashlets->right)) $dashlets->right=array(); + //if (!isset($dashlets->left)) $dashlets->left=array(); + //if (!isset($dashlets->right)) $dashlets->right=array(); $column=1; foreach($aDashlets as $dashlet) -- libgit2 0.21.4