Implement request #2934872: Option to set the "no description"

  description. Patch by fnorder@users.sourceforge.net

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@615 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/data/config.default.php b/data/config.default.php
index c3c3b583ccd69ef99afccea650847a12a9103647..a0010e91244ea30d86d5c4a00ad4803340dcf41c 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -388,6 +388,17 @@ $defaultOrderBy = 'date_desc';
  */
 $dateOrderField = 'bModified';
 
+/**
+ * What to show instead of a description if
+ * a bookmark has none.
+ * Default is '-'. Setting this to '' will collapse
+ * the description row for bookmarks without
+ * a description.
+ *
+ * @var string
+ */
+$blankDescription = '-';
+
 /**
  * Number of entries that are shown in
  * the RSS feed by default.

diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index c6a87c2e35654a87ac2b4802dade97307b605125..9418563da1187232b5f047c3d440522ae5f02197 100644 (file)
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -334,7 +334,7 @@ if($currenttag!= '') {
 
                echo '<div class="link"><a href="'. $address .'"'. $rel .' class="taggedlink" target="_blank">'. filter($row['bTitle']) ."</a>" . $adminStar . "</div>\n";
                if ($row['bDescription'] == '') {
-                       $bkDescription = '-';
+                       $bkDescription = $GLOBALS['blankDescription'];
                } else {
                        // Improve description display (anchors, links, ...)
                        $bkDescription = preg_replace('|\[\/.*?\]|', '', filter($row['bDescription'])); // remove final anchor

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e5022effa2feb2c6055c2ad1e8c96b078564f7a7..1f44ed9d43564b9480c195f18bb53d2ec439b10e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -13,6 +13,8 @@ ChangeLog for SemantiScuttle
 - Fix several SQL injection possibilities
 - Implement request #2934868: Do not display full redirection URL
   Patch by fnorder@users.sourceforge.net
+- Implement request #2934872: Option to set the "no description"
+  description. Patch by fnorder@users.sourceforge.net
 
 
 0.95.2 - 2010-01-16