summaryrefslogtreecommitdiff
path: root/inc/geshi.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2005-09-22 18:04:31 +0200
committerAndreas Gohr <andi@splitbrain.org>2005-09-22 18:04:31 +0200
commita9cd1c6aa3775e9e863af253b3a00a66a9036a83 (patch)
tree743dfb0ffefaba2aa32f490036fff9cd94677ea8 /inc/geshi.php
parentea3a66b20ac38cf452125dca0bc416d480d6d82c (diff)
downloadrpg-a9cd1c6aa3775e9e863af253b3a00a66a9036a83.tar.gz
rpg-a9cd1c6aa3775e9e863af253b3a00a66a9036a83.tar.bz2
geshi updated to 1.0.7.3
darcs-hash:20050922160431-7ad00-4bbcdc2804d46745cb763524c05fdb73f13186f1.gz
Diffstat (limited to 'inc/geshi.php')
-rw-r--r--inc/geshi.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/inc/geshi.php b/inc/geshi.php
index 1f3611f0a..c3a6cb643 100644
--- a/inc/geshi.php
+++ b/inc/geshi.php
@@ -28,7 +28,7 @@
* @author Nigel McNie <nigel@geshi.org>
* @copyright Copyright &copy; 2004, 2005, Nigel McNie
* @license http://gnu.org/copyleft/gpl.html GNU GPL
- * @version $Id: geshi.php,v 1.13 2005/09/03 12:54:37 oracleshinoda Exp $
+ * @version $Id: geshi.php,v 1.15 2005/09/22 01:41:46 oracleshinoda Exp $
*
*/
@@ -40,7 +40,7 @@
//
/** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.7.2');
+define('GESHI_VERSION', '1.0.7.3');
/** For the future (though this may never be realised) */
define('GESHI_OUTPUT_HTML', 0);
@@ -69,9 +69,9 @@ define('GESHI_FANCY_LINE_NUMBERS', 2);
// Container HTML type
/** Use nothing to surround the source */
define('GESHI_HEADER_NONE', 0);
-/** Use a <div> to surround the source */
+/** Use a "div" to surround the source */
define('GESHI_HEADER_DIV', 1);
-/** Use a <pre> to surround the source */
+/** Use a "pre" to surround the source */
define('GESHI_HEADER_PRE', 2);
// Capatalisation constants
@@ -515,9 +515,9 @@ class GeSHi
/**
* Sets the type of header to be used.
*
- * If GESHI_HEADER_DIV is used, the code is surrounded in a <div>.This
+ * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This
* means more source code but more control over tab width and line-wrapping.
- * GESHI_HEADER_PRE means that a <pre> is used - less source, but less
+ * GESHI_HEADER_PRE means that a "pre" is used - less source, but less
* control. Default is GESHI_HEADER_PRE.
*
* From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
@@ -1735,9 +1735,10 @@ class GeSHi
$result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding);
}
// Close the <span> that surrounds the block
- if ($this->strict_mode && $this->lexic_permissions['SCRIPT']) {
+ // Removed since the only time this is used is for php and it doesn't need a </span>
+ /*if ($this->strict_mode && $this->lexic_permissions['SCRIPT']) {
$result .= '</span>';
- }
+ }*/
} else {
// Else not a block to highlight
$result .= @htmlspecialchars($part, ENT_COMPAT, $this->encoding);