[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28755] branches/proposals/5.x/lib/tikilib.php

[<sy...@us...>]

Revision: 28755
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28755&view=rev
Author:   sylvieg
Date:     2010-08-29 22:07:00 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
[bp 27355][FIX]parsing: leave alone and do not add <br /> the is_html data

Modified Paths:
--------------
    branches/proposals/5.x/lib/tikilib.php

Modified: branches/proposals/5.x/lib/tikilib.php
===================================================================
--- branches/proposals/5.x/lib/tikilib.php	2010-08-29 21:45:38 UTC (rev 28754)
+++ branches/proposals/5.x/lib/tikilib.php	2010-08-29 22:07:00 UTC (rev 28755)
@@ -6960,7 +6960,7 @@
 									// A normal in-paragraph line or a consecutive blank line.
 									// Leave it as is.
 								}
-							} else {
+							} elseif (empty($options['is_html']) || !$options['is_html']) {
 								$line .= '<br />';
 							}
 						}


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