From 6e9829faf611c94a607ec0741a679ba8dffe8c8c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 10 Mar 2008 15:49:46 +0000 Subject: [PATCH] some more php5 and html static fixes --- etemplate/inc/class.boetemplate.inc.php | 2 +- etemplate/inc/class.editor.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php index b7d82891ba..76a55da95c 100644 --- a/etemplate/inc/class.boetemplate.inc.php +++ b/etemplate/inc/class.boetemplate.inc.php @@ -464,7 +464,7 @@ class boetemplate extends soetemplate * the $name might be "$name.$app" to give a app-name (default is the current app,or template-name) * @return string/boolean human readable name or false if not found/loadable */ - protected function loadExtension($type) + function loadExtension($type) { list($class,$app) = explode('.',$type); $class .= '_widget'; diff --git a/etemplate/inc/class.editor.inc.php b/etemplate/inc/class.editor.inc.php index ad5c2da2d7..82a9e7f5ea 100644 --- a/etemplate/inc/class.editor.inc.php +++ b/etemplate/inc/class.editor.inc.php @@ -375,7 +375,7 @@ $link = $this->etemplate->as_array(-1); $link['menuaction'] = 'etemplate.editor.edit'; $link['version'] = $newest_version; - $msg = lang("newer version '%1' exists !!!",$this->etemplate->html->a_href($newest_version,$link)); + $msg = lang("newer version '%1' exists !!!",html::a_href($newest_version,$link)); } } if (!is_array($this->extensions)) @@ -460,7 +460,7 @@ $new_content = $this->etemplate->as_array() + array( 'msg' => $msg, 'xml_label' => $xml_label, - 'xml' => $xml ? '
'.$this->etemplate->html->htmlspecialchars($xml)."
\n" : '', + 'xml' => $xml ? '
'.html::htmlspecialchars($xml)."
\n" : '', ); $editor =& new etemplate('etemplate.editor.new'); @@ -495,7 +495,7 @@ '; if ($app != 'etemplate' && file_exists(EGW_SERVER_ROOT.'/'.$app.'/templates/default/app.css')) { - $new_content['onclick'] .= $editor->html->style('@import url('.$GLOBALS['egw_info']['server']['webserver_url'].'/'.$app.'/templates/default/app.css);'); + $new_content['onclick'] .= html::style('@import url('.$GLOBALS['egw_info']['server']['webserver_url'].'/'.$app.'/templates/default/app.css);'); } $editor->data[$editor->rows]['A']['obj'] = &$this->etemplate; $vals = $content['vals'];