From: Rodrigo P. <rod...@gm...> - 2011-10-31 21:04:34
|
Hi, Chealer proposed this backport a few months ago but it was rejected mainly because it was done too close to a release but also because some people think it might fix one problem by creating others. See: http://article.gmane.org/gmane.comp.cms.tiki.cvs/64930 and http://sourceforge.net/mailarchive/message.php?msg_id=27663528 Today while upgrading a site from Tiki 2 to Tiki 6 I have come across the same bug. Basically all the line breaks in a wiki page with HTML enabled are ignored by the parser. Since now we have more time to test before the next 6.x release and this piece of code is being used in all Tiki versions after 6 I'm proposing this backport again. I can confirm it fix a regression bug in my setup but I haven't considered/tested other setups. Rodrigo On Mon, Oct 31, 2011 at 6:44 PM, <sam...@us...> wrote: > Revision: 38603 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=38603&view=rev > Author: sampaioprimo > Date: 2011-10-31 20:44:41 +0000 (Mon, 31 Oct 2011) > Log Message: > ----------- > [bp/r34955][FIX] Parsing: missing line breaks when Allow HTML is enabled. > reverts r27355 > > Revision Links: > -------------- > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34955&view=rev > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27355&view=rev > > Modified Paths: > -------------- > branches/proposals/6.x/lib/tikilib.php > > Modified: branches/proposals/6.x/lib/tikilib.php > =================================================================== > --- branches/proposals/6.x/lib/tikilib.php 2011-10-31 19:53:00 UTC > (rev 38602) > +++ branches/proposals/6.x/lib/tikilib.php 2011-10-31 20:44:41 UTC > (rev 38603) > @@ -6875,7 +6875,7 @@ > > // Leave it as is. > } > } > - } elseif > (($prefs['wysiwyg_htmltowiki'] === 'y' && !empty($tline) && strpos($tline, > '<br />') === false) || !$options['is_html']) { > + } else { > $line .= > "<br />"; > } > } > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > > ------------------------------------------------------------------------------ > Get your Android app more play: Bring it to the BlackBerry PlayBook > in minutes. BlackBerry App World™ now supports Android™ Apps > for the BlackBerry® PlayBook™. Discover just how easy and simple > it is! http://p.sf.net/sfu/android-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- http://rodrigo.utopia.org.br |