[geeklog-cvs] geeklog: Merge with Dirk's changes

[geeklog-cvs at lists.geeklog.net]

changeset 7805:ce2b99eeb8ec
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ce2b99eeb8ec
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 16 15:19:24 2010 -0400
description:
Merge with Dirk's changes

diffstat:

 plugins/links/functions.inc |  6 +++---
 public_html/docs/history    |  6 ++++++
 public_html/links/index.php |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 393e470f1bca -r ce2b99eeb8ec plugins/links/functions.inc
--- a/plugins/links/functions.inc	Tue Mar 16 15:14:00 2010 -0400
+++ b/plugins/links/functions.inc	Tue Mar 16 15:19:24 2010 -0400
@@ -522,7 +522,7 @@
         $lids[] = $row['lid'];
 
         $linktitle = stripslashes( $row['title'] );
-        $linkdesc = stripslashes( $row['description'] );
+        $linkdesc = PLG_replaceTags( stripslashes($row['description']) );
 
         $linklink = COM_buildUrl( $_CONF['site_url']
                   . '/links/portal.php?what=link&item=' . $row['lid'] );
@@ -1024,7 +1024,7 @@
     global $_CONF, $_TABLES, $LANG_LINKS, $LANG_LINKS_SUBMIT, $LANG08;
 
     $title = stripslashes ($A['title']);
-    $description = stripslashes ($A['description']);
+    $description = PLG_replaceTags( stripslashes($A['description']) );
 
     $mailbody = "$LANG_LINKS_SUBMIT[8]: $title\n"
               . "$LANG_LINKS_SUBMIT[9]: <{$A['url']}>\n"
@@ -1520,7 +1520,7 @@
                 break;
             case 'description':
             case 'excerpt':
-                $props[$p] = stripslashes($A['description']);
+                $props[$p] = PLG_replaceTags( stripslashes($A['description']) );
                 break;
             case 'id':
                 $props['id'] = $A['lid'];
diff -r 393e470f1bca -r ce2b99eeb8ec public_html/docs/history
--- a/public_html/docs/history	Tue Mar 16 15:14:00 2010 -0400
+++ b/public_html/docs/history	Tue Mar 16 15:19:24 2010 -0400
@@ -80,6 +80,8 @@
 
 Calendar Plugin
 ---------------
+- Added support for a CAPTCHA in the submission form (bug #0001091, patch
+  provided by tuxcanfly)
 - Fixed an old bug in the event submission form: The text of the "Submit" button
   must match the text $LANG12[8] to be recognized. Changed the form to always
   use that string instead of the one from Calendar plugin's language file
@@ -87,6 +89,10 @@
 
 Links Plugin
 ------------
+- Allow autotags in the Links and Link Category description (feature request
+  #0001079, patch provided by Akeda Bagus)
+- Added support for a CAPTCHA in the submission form (bug #0001091, patch
+  provided by tuxcanfly)
 - Added a link to "New category" from the Links editor [Dirk]
 - Fixed localization of "Root" category (bug #0001047) [Dirk]
 
diff -r 393e470f1bca -r ce2b99eeb8ec public_html/links/index.php
--- a/public_html/links/index.php	Tue Mar 16 15:14:00 2010 -0400
+++ b/public_html/links/index.php	Tue Mar 16 15:19:24 2010 -0400
@@ -202,7 +202,7 @@
 
                 $linklist->set_var ('category_name', $C['category']);
                 if ($_LI_CONF['show_category_descriptions']) {
-                    $linklist->set_var ('category_description', $C['description']);
+                    $linklist->set_var ('category_description', PLG_replaceTags( $C['description'] ));
                 } else {
                     $linklist->set_var ('category_description', '');
                 }
@@ -363,7 +363,7 @@
     $template->set_var('link_name_encoded', urlencode($title));
     $template->set_var('link_hits', COM_numberFormat($A['hits']));
     $template->set_var('link_description',
-                       nl2br(stripslashes($A['description'])));
+                       PLG_replaceTags( nl2br(stripslashes($A['description'])) ));
 
     $attr = array('title' => $actualUrl);
     if (substr($actualUrl, 0, strlen($_CONF['site_url'])) != $_CONF['site_url']) {