mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-03-01 16:51:33 +01:00
fix image with name filter is not found, because empty vfs store returns empty array having a method filter, now we check that attribute is of type string
This commit is contained in:
parent
d6d9a076ae
commit
760c8193fb
@ -88,17 +88,17 @@ egw.extend('images', egw.MODULE_GLOBAL, function()
|
|||||||
|
|
||||||
// own instance specific images in vfs have highest precedence
|
// own instance specific images in vfs have highest precedence
|
||||||
tries['vfs']=_name;
|
tries['vfs']=_name;
|
||||||
if (typeof images['vfs'] != 'undefined' && typeof images['vfs'][_name] != 'undefined')
|
if (typeof images['vfs'] != 'undefined' && typeof images['vfs'][_name] == 'string')
|
||||||
{
|
{
|
||||||
return this.webserverUrl+images['vfs'][_name];
|
return this.webserverUrl+images['vfs'][_name];
|
||||||
}
|
}
|
||||||
tries[_app + (_app == 'phpgwapi' ? " (current app)" : "")] = _name;
|
tries[_app + (_app == 'phpgwapi' ? " (current app)" : "")] = _name;
|
||||||
if (typeof images[_app] != 'undefined' && typeof images[_app][_name] != 'undefined')
|
if (typeof images[_app] != 'undefined' && typeof images[_app][_name] == 'string')
|
||||||
{
|
{
|
||||||
return this.webserverUrl+images[_app][_name];
|
return this.webserverUrl+images[_app][_name];
|
||||||
}
|
}
|
||||||
tries['phpgwapi'] = _name;
|
tries['phpgwapi'] = _name;
|
||||||
if (typeof images['phpgwapi'] != 'undefined' && typeof images['phpgwapi'][_name] != 'undefined')
|
if (typeof images['phpgwapi'] != 'undefined' && typeof images['phpgwapi'][_name] == 'string')
|
||||||
{
|
{
|
||||||
return this.webserverUrl+images['phpgwapi'][_name];
|
return this.webserverUrl+images['phpgwapi'][_name];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user