Peter M. Groen / knowledgetree

Commit 1c6d05282c47af9a94cbdb3f87d35b3ac5378e00

Authored by Conrad Vermeulen
1 parent 21e43bdd

KTS-1778 

"PHP5 array_merge produces warnings with dashlet display fix"
Fixed.

Reviewed By: Jalaloedien Abrahams

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6365 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 2 deletions
lib/users/User.inc
  View file @1c6d052
@@ -187,6 +187,9 @@ class User extends KTEntity { @@ -187,6 +187,9 @@ class User extends KTEntity {
187 187
188 $state = $this->getDashboardState(); 188 $state = $this->getDashboardState();
189 $dashlets = $oJSON->decode($state); 189 $dashlets = $oJSON->decode($state);
  190 +
  191 + if (!isset($dashlets->left)) $dashlets->left = array();
  192 + if (!isset($dashlets->right)) $dashlets->right = array();
190 $mergedlist = array_merge($dashlets->left,$dashlets->right); 193 $mergedlist = array_merge($dashlets->left,$dashlets->right);
191 194
192 195
@@ -197,8 +200,8 @@ class User extends KTEntity { @@ -197,8 +200,8 @@ class User extends KTEntity {
197 } 200 }
198 $update=false; 201 $update=false;
199 202
200 - if (!isset($dashlets->left)) $dashlets->left=array();  
201 - if (!isset($dashlets->right)) $dashlets->right=array(); 203 + //if (!isset($dashlets->left)) $dashlets->left=array();
  204 + //if (!isset($dashlets->right)) $dashlets->right=array();
202 205
203 $column=1; 206 $column=1;
204 foreach($aDashlets as $dashlet) 207 foreach($aDashlets as $dashlet)