[phpwiki-checkins] SF.net SVN: phpwiki:[6233] trunk/lib/plugin/SyntaxHighlighter.php

[<var...@us...>]

Revision: 6233
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6233&view=rev
Author:   vargenau
Date:     2008-09-05 09:48:17 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Fix bug 1906123: use --inline-css

Modified Paths:
--------------
    trunk/lib/plugin/SyntaxHighlighter.php

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2008-09-05 08:25:32 UTC (rev 6232)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2008-09-05 09:48:17 UTC (rev 6233)
@@ -162,7 +162,7 @@
                 $html->pushContent($this->error(fmt("invalid %s ignored",'color')));
                 $color = false;
             }
-            if (!empty($color)) $args .= " --style $color -c ".FindFile("uploads")."/highlight-$color.css";
+            if (!empty($color)) $args .= " --style $color --inline-css";
             if (!empty($style)) $args .= " -F $style";
             $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
             if (check_php_version(4,3,0))
@@ -174,41 +174,13 @@
             $pre = HTML::pre(HTML::raw($code));
             $pre->setAttr('class','tightenable top bottom');
             $html->pushContent($pre);
-            $css = $GLOBALS['WikiTheme']->_CSSlink('',empty($color) ? 'highlight.css' : "uploads/highlight-$color.css",'');
-            return HTML($css,$html);
+            return HTML($html);
         } else {
             return $this->error(fmt("empty source"));
         }
     }
 };
 
-// $Log: not supported by cvs2svn $
-// Revision 1.6  2004/06/29 18:47:40  rurban
-// use predefined constants, and added sf.net defaults
-//
-// Revision 1.5  2004/06/14 11:31:39  rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-//   default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.4  2004/05/18 14:49:52  rurban
-// Simplified strings for easier translation
-//
-// Revision 1.3  2004/05/14 17:33:12  rurban
-// new plugin RecentChanges
-//
-// Revision 1.2  2004/05/14 15:56:16  rurban
-// protect color argument, more error handling, added default css
-//
-// Revision 1.1  2004/05/14 14:55:52  rurban
-// Alec Thomas original plugin, which comes with highlight http://www.andre-simon.de/,
-// plus some extensions by Reini Urban
-//
-//
-
 // For emacs users
 // Local Variables:
 // mode: php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.