holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure data is set before trying to look inside it.

Browse Source
This commit is contained in:
Nathan Gray 2013-12-16 18:11:53 +00:00
parent a014b7ba7c
commit a1e5783da6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/etemplate2.js
View File

@ -690,7 +690,7 @@ function etemplate2_handle_load(_type, _response)
} }
// need to set app_header before message, as message temp. replaces app_header // need to set app_header before message, as message temp. replaces app_header
if (typeof data.data.app_header == 'string') if (typeof data.data == 'object' && typeof data.data.app_header == 'string')
{ {
window.egw_app_header(data.data.app_header); window.egw_app_header(data.data.app_header);
delete data.data.app_header; delete data.data.app_header;
@ -723,7 +723,7 @@ function etemplate2_handle_load(_type, _response)
{ {
window.framework.setSidebox.apply(window.framework, data.setSidebox); window.framework.setSidebox.apply(window.framework, data.setSidebox);
} }
// regular et2 re-load // regular et2 re-load
if (typeof data.url == "string" && typeof data.data === 'object') if (typeof data.url == "string" && typeof data.data === 'object')
{ {