From: Chuck Hagenbuch Date: Fri, 8 Oct 2010 01:52:33 +0000 (-0400) Subject: The base version of this viewer shouldn't be making Horde:: calls. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e6968b8eb48621b6cd7648ce63d333581c614c62;p=horde.git The base version of this viewer shouldn't be making Horde:: calls. --- diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php index b7fbe2c51..9dc77766b 100644 --- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php +++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php @@ -49,26 +49,6 @@ class Horde_Mime_Viewer_Syntaxhighlighter extends Horde_Mime_Viewer_Base $language = $this->_mimeTypeToLanguage($mimeType); $brush = $this->_languageToBrush($language); - if (!$this->_shLoaded) { - Horde::addScriptFile('syntaxhighlighter/scripts/shCore.js', 'horde', true); - Horde::addInlineScript(array( - 'SyntaxHighlighter.defaults[\'toolbar\'] = false;', - 'SyntaxHighlighter.all();', - ), 'dom'); - $this->_shLoaded = true; - - $sh_js_fs = $GLOBALS['injector']->getInstance('Horde_Registry')->get('jsfs', 'horde') . '/syntaxhighlighter/styles/'; - $sh_js_uri = Horde::url($GLOBALS['injector']->getInstance('Horde_Registry')->get('jsuri', 'horde'), false, -1) . '/syntaxhighlighter/styles/'; - Horde_Themes::includeStylesheetFiles(array('additional' => array( - array('f' => $sh_js_fs . 'shCoreEclipse.css', 'u' => $sh_js_uri . 'shCoreEclipse.css'), - array('f' => $sh_js_fs . 'shThemeEclipse.css', 'u' => $sh_js_uri . 'shThemeEclipse.css'), - ))); - } - if (empty($this->_shBrushes[$brush])) { - Horde::addScriptFile('syntaxhighlighter/scripts/shBrush' . $brush . '.js', 'horde', true); - $this->_shBrushes[$brush] = true; - } - $results = '
' . htmlspecialchars($this->_mimepart->getContents()) . '
'; return $this->_renderReturn( $results,