extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

make sure null is returned as null, not as empty object ({})

Browse Source
This commit is contained in:
Ralf Becker 2015-01-15 20:11:23 +00:00
parent 89fd9e35cf
commit d46def6606
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/js/jsapi/egw_preferences.js
View File

@ -66,9 +66,10 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function() {
request.sendRequest(false, 'GET'); // use synchronous (cachable) GET request request.sendRequest(false, 'GET'); // use synchronous (cachable) GET request
if (typeof prefs[_app] == 'undefined') prefs[_app] = {}; if (typeof prefs[_app] == 'undefined') prefs[_app] = {};
} }
if(_name == "*") return typeof prefs[_app] ==='object'?jQuery.extend({},prefs[_app]):prefs[_app]; if (_name == "*") return typeof prefs[_app] ==='object' ? jQuery.extend({},prefs[_app]) : prefs[_app];
return typeof prefs[_app][_name] ==='object'?jQuery.extend({},prefs[_app][_name]):prefs[_app][_name]; return typeof prefs[_app][_name] === 'object' && prefs[_app][_name] !== null ?
jQuery.extend({},prefs[_app][_name]) : prefs[_app][_name];
}, },
/** /**