summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar cweiske2010-01-19 20:23:23 +0000
committerGravatar cweiske2010-01-19 20:23:23 +0000
commit7240d693de33dc3b66fadbf0d11c2f23be67ea24 (patch)
treecaa49edd16a2554bda58ad8d2305e61fed5f0aa6
parentcc1d7d7a4d9cbcbf604416b7487e4868193d4b75 (diff)
downloadscuttle-7240d693de33dc3b66fadbf0d11c2f23be67ea24.tar.gz
scuttle-7240d693de33dc3b66fadbf0d11c2f23be67ea24.zip
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
-rw-r--r--data/config.default.php11
-rw-r--r--data/templates/bookmarks.tpl.php2
-rw-r--r--doc/ChangeLog2
3 files changed, 14 insertions, 1 deletions
diff --git a/data/config.default.php b/data/config.default.php
index c3c3b58..a0010e9 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -389,6 +389,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 c6a87c2..9418563 100644
--- 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 e5022ef..1f44ed9 100644
--- 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