Changeset 53 for branches/geshi_highlight

Timestamp:

02/16/09 14:39:14 (3 years ago)

Author:

daris

Message:

geshi highlight: fixed bug with not replacing ' as single quote and releasing 1.0.3'

Files:

• branches/geshi_highlight/manifest.xml (modified) (3 diffs)

branches/geshi_highlight/manifest.xml

@@ -4 +4 @@
         <id>geshi_highlight</id>
         <title>GeSHi Highlight</title>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
         <description>Highlights code tags in posts using GeSHi highlighter.</description>
         <author>Daris</author>
@@ -20 +20 @@
                         if (!function_exists('htmlspecialchars_decode'))
                         {
-                                function htmlspecialchars_decode($str)
+                                function htmlspecialchars_decode($str, $quote_style = ENT_COMPAT)
                                 {
-                                        return strtr($str, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
+                                        return strtr($str, array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style)));
                                 }
                         }
@@ -29 +29 @@
                         {
                                 $lang = $matches[1];
-                                $source = htmlspecialchars_decode(trim($matches[2]));
+                                $source = htmlspecialchars_decode(trim($matches[2]), ENT_QUOTES);
+                                $source = str_replace('&#039;', '\'', $source); // geshi uses &#039; as single quote instead of &#39;
                                 $geshi = new GeSHi($source, $lang);
                                 $code = $geshi->parse_code();
-                                $code = substr($code, strpos($code, 'monospace;">') + 12);
-                                $code = substr($code, 0, strpos($code, '</pre>'));
-                                return '[code]'.$code.'[/code]';
+                                return '</p><div class="codebox">'.$code.'</div><p>';
                         }