mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
fix common::get_body_attribs() (gave fatal error, because egw_framework::_get_body_attribs() was protected) and add body_attribs to Sitemgr Template3::get_meta()
This commit is contained in:
parent
6549d3e463
commit
5507c32e4e
@ -986,7 +986,7 @@ class common
|
||||
/**
|
||||
* Used by template headers for including CSS in the header
|
||||
*
|
||||
* @deprecated use framework::_get_css()
|
||||
* @deprecated use $GLOBALS['egw']->framework->_get_css()
|
||||
* @return string
|
||||
*/
|
||||
static function get_css()
|
||||
@ -997,23 +997,23 @@ class common
|
||||
/**
|
||||
* Used by the template headers for including javascript in the header
|
||||
*
|
||||
* @deprecated use framework::_get_js()
|
||||
* @deprecated use egw_framework::_get_js()
|
||||
* @return string the javascript to be included
|
||||
*/
|
||||
static function get_java_script()
|
||||
{
|
||||
return $GLOBALS['egw']->framework->_get_js();
|
||||
return egw_framework::_get_js();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns on(Un)Load attributes from js class
|
||||
*
|
||||
* @deprecated use framework::_get_js()
|
||||
* @deprecated use egw_framework::_get_js()
|
||||
* @returns string body attributes
|
||||
*/
|
||||
static function get_body_attribs()
|
||||
{
|
||||
return $GLOBALS['egw']->framework->_get_body_attribs();
|
||||
return egw_framework::_get_body_attribs();
|
||||
}
|
||||
|
||||
static function hex2bin($data)
|
||||
|
@ -674,7 +674,7 @@ abstract class egw_framework
|
||||
* @author Dave Hall (*based* on verdilak? css inclusion code)
|
||||
* @return array with keys 'app_css' from the css method of the menuaction-class and 'file_css' (app.css file of the application)
|
||||
*/
|
||||
protected function _get_css()
|
||||
public function _get_css()
|
||||
{
|
||||
$app_css = '';
|
||||
if(isset($_GET['menuaction']))
|
||||
@ -1053,7 +1053,7 @@ abstract class egw_framework
|
||||
*
|
||||
* @returns string the attributes to be used
|
||||
*/
|
||||
static protected function _get_body_attribs()
|
||||
static public function _get_body_attribs()
|
||||
{
|
||||
$js = '';
|
||||
foreach(self::$body_tags as $what => $data)
|
||||
|
Loading…
Reference in New Issue
Block a user