- [ZBX-2763] merged rev. 13614-13615 of /branches/1.8 (Aly)

zhcxrs · Jul 26, 2010 · a47ed38 · a47ed38
1 parent af65954
commit a47ed38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,7 @@ Changes for 1.9
 
 Changes for 1.8.3
 
+ - [ZBX-2763] fixed saving user profile (Aly)
  - [ZBX-2759] fixed item form not saving params field (Vedmak)
  - [ZBX-2762] fixed sql error when "all" hosts is selected in application popup (Vedmak)
  - [ZBX-2757] fixed calendar colors in DO theme (Vedmak)

diff --git a/frontends/php/api/classes/class.cuser.php b/frontends/php/api/classes/class.cuser.php
@@ -121,7 +121,7 @@ public static function get($options=array()){
 				' )';
 		}
 		else if(!is_null($options['editable']) || ($USER_DETAILS['type']!=USER_TYPE_SUPER_ADMIN)){
-			return array();
+			$options['userids'] = $USER_DETAILS['userid'];
 		}
 
 // nodeids