cvs: phpweb /include layout.inc
| From: | Hannes Magnusson | Date: | Tue, 18 Sep 2007 11:33:39 +0000 |
| Subject: | cvs: phpweb /include layout.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-74@lists.php.net to get a copy of this message | ||
bjori Tue Sep 18 11:33:39 2007 UTC
Modified files:
/phpweb/include layout.inc
Log:
Fixed bug#42697 (user comment needs formating)
http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.268&r2=1.269&diff_format=u
Index: phpweb/include/layout.inc
diff -u phpweb/include/layout.inc:1.268 phpweb/include/layout.inc:1.269
--- phpweb/include/layout.inc:1.268 Thu Jun 7 10:36:00 2007
+++ phpweb/include/layout.inc Tue Sep 18 11:33:39 2007
@@ -1,5 +1,5 @@
<?php
-/* $Id: layout.inc,v 1.268 2007/06/07 10:36:00 bjori Exp $ */
+/* $Id: layout.inc,v 1.269 2007/09/18 11:33:39 bjori Exp $ */
// Set the static content root differently on php.net
$_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ?
@@ -24,7 +24,7 @@
// This should eventually be a php_syntax_check() call when we move to PHP5
// But use this ugly hack for now to avoid code snippets with bad syntax screwing up the
highlighter
- if(strstr($highlighted,"include/layout.inc</b>")) $highlighted = '<span
class="default">'.htmlentities($code)."</span>";
+ if(strstr($highlighted,"include/layout.inc</b>")) $highlighted = '<span
class="html">'.nl2br(htmlentities($code))."</span>";
// Fix output to use CSS classes and wrap well
$highlighted = '<div class="phpcode">' . str_replace(