mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-29 01:59:39 +01:00
fix getAppName sometimes reports "phpgwapi" from this.appName causing eg. attachment icon in filemanager to come from old phpgwapi directory
This commit is contained in:
parent
5d1ccb55a0
commit
f699c36a47
@ -512,17 +512,11 @@
|
|||||||
* Returns the current application name. The current application
|
* Returns the current application name. The current application
|
||||||
* name equals the name, which was given when calling the egw
|
* name equals the name, which was given when calling the egw
|
||||||
* function. If the getAppName function is called on the global
|
* function. If the getAppName function is called on the global
|
||||||
* instance, 'etemplate' is returned.
|
* instance, 'api' is returned.
|
||||||
*/
|
*/
|
||||||
getAppName: function() {
|
getAppName: function() {
|
||||||
// Return the default application name if this function is
|
|
||||||
// called on the global egw instance.
|
|
||||||
if (!this.appName) {
|
|
||||||
return 'etemplate';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Otherwise return the correct application name.
|
// Otherwise return the correct application name.
|
||||||
return this.appName;
|
return this.app_name() || this.appName || 'api';
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -717,4 +711,3 @@
|
|||||||
this['egw'] = egw;
|
this['egw'] = egw;
|
||||||
}
|
}
|
||||||
}).call(window);
|
}).call(window);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user