[geeklog-hg] geeklog: Fixed COM_nl2br() that replaces newlines with a line br...

[geeklog-cvs at lists.geeklog.net]

changeset 8963:810674f603c3
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/810674f603c3
user: Tom <websitemaster at cogeco.net>
date: Wed Feb 20 16:25:07 2013 -0500
description:
Fixed COM_nl2br() that replaces newlines with a line break tag (bug #0001141)

diffstat:

 public_html/backend/geeklog.rss |  57 +++++++++++++++++++++++++++++++++++++++++
 public_html/lib-common.php      |   4 +-
 2 files changed, 59 insertions(+), 2 deletions(-)

diffs (79 lines):

diff -r bc86b18e1a83 -r 810674f603c3 public_html/backend/geeklog.rss
--- a/public_html/backend/geeklog.rss	Tue Feb 19 20:53:20 2013 -0500
+++ b/public_html/backend/geeklog.rss	Wed Feb 20 16:25:07 2013 -0500
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rss version="2.0" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<channel>
+<title>Geeklog Site</title>
+<link>http://192.168.1.200</link>
+<description>Another Nifty Geeklog Site</description>
+<managingEditor>admin at 192.168.1.200</managingEditor>
+<webMaster>admin at 192.168.1.200</webMaster>
+<copyright>Copyright 2013 Geeklog Site</copyright>
+<generator>Geeklog</generator>
+<pubDate>Wed, 20 Feb 2013 16:19:52 -0500</pubDate>
+<language>en-gb</language>
+<atom:link href="http://192.168.1.200/backend/geeklog.rss" rel="self" type="application/rss+xml" />
+<item>
+<title>Test Story Submission 2</title>
+<link>http://192.168.1.200/article.php?story=20130115102527522</link>
+<guid isPermaLink="true">http://192.168.1.200/article.php?story=20130115102527522</guid>
+<pubDate>Tue, 15 Jan 2013 10:25:27 -0500</pubDate>
+<comments>http://192.168.1.200/article.php?story=20130115102527522#comments</comments>
+<dc:subject>Business</dc:subject>
+<description>Test Story Submission 2<br /><br />Test Story Submission 2<br /><br /></description>
+<trackback:ping>http://192.168.1.200/trackback.php?id=20130115102527522</trackback:ping>
+</item>
+<item>
+<title>Topic Stuff</title>
+<link>http://192.168.1.200/article.php?story=20130110113235485</link>
+<guid isPermaLink="true">http://192.168.1.200/article.php?story=20130110113235485</guid>
+<pubDate>Thu, 10 Jan 2013 11:32:35 -0500</pubDate>
+<comments>http://192.168.1.200/article.php?story=20130110113235485#comments</comments>
+<dc:subject>General News</dc:subject>
+<description>Topic Stuff<br /><br /><a href="http://192.168.1.200/article.php?story=welcome">Welcome to Geeklog!</a><br /><a href="http://192.168.1.200/users.php?mode=profile&amp;uid=2">Admin</a><br /><a href="http://192.168.1.200/links/portal.php?what=link&amp;item=geeklog.net" title="http://www.geeklog.net/" class="ext-link">Geeklog Project Homepage</a><br />This is a Test!<br /></description>
+<trackback:ping>http://192.168.1.200/trackback.php?id=20130110113235485</trackback:ping>
+</item>
+<item>
+<title>I♥NY</title>
+<link>http://192.168.1.200/article.php?story=INY</link>
+<guid isPermaLink="true">http://192.168.1.200/article.php?story=INY</guid>
+<pubDate>Mon, 07 Jan 2013 11:07:13 -0500</pubDate>
+<comments>http://192.168.1.200/article.php?story=INY#comments</comments>
+<dc:subject>Geeklog</dc:subject>
+<description>I♥NY Test 2<br /></description>
+<trackback:ping>http://192.168.1.200/trackback.php?id=INY</trackback:ping>
+</item>
+<item>
+<title>Welcome to Geeklog!</title>
+<link>http://192.168.1.200/article.php?story=welcome</link>
+<guid isPermaLink="true">http://192.168.1.200/article.php?story=welcome</guid>
+<pubDate>Thu, 20 Dec 2012 11:26:19 -0500</pubDate>
+<comments>http://192.168.1.200/article.php?story=welcome#comments</comments>
+<dc:subject>Geeklog</dc:subject>
+<description><p>Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the <a href="docs/english/index.html">docs directory</a>. Geeklog now has enhanced, user-based security.  You should thoroughly understand how these work before you run a production Geeklog Site.</p>
<p>To log into your new Geeklog site, please use this account:</p>
<p>Username: <b>Admin</b><br />
Password: <b>password</b></p><p><b>And don't forget to <a href="usersettings.php">change your password</a> after logging in!</b></p>
+</description>
+<trackback:ping>http://192.168.1.200/trackback.php?id=welcome</trackback:ping>
+</item>
+</channel>
+</rss>
diff -r bc86b18e1a83 -r 810674f603c3 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Feb 19 20:53:20 2013 -0500
+++ b/public_html/lib-common.php	Wed Feb 20 16:25:07 2013 -0500
@@ -8420,9 +8420,9 @@
         define('XHTML', '');
     }
 
-    $tag = '<br' . XHTML . '>';
+    $replace = '<br' . XHTML . '>';
     $find = array("\r\n", "\n\r", "\r", "\n");
-    $replace = array($tag."\r\n", $tag."\n\r", $tag."\r", $tag."\n");
+
     return str_replace($find, $replace, $string);
 }