aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-03-10 19:39:38 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-03-10 19:40:28 +0100
commit107f80892a19f0ccd0cd30a0e3fc5ce3a41829b7 (patch)
tree59a614631fddf5ab3d955d6a87cf30e96e769061
parentfbcb711945353fe26681f05839b728ade74317c9 (diff)
downloadvolse-hubzilla-107f80892a19f0ccd0cd30a0e3fc5ce3a41829b7.tar.gz
volse-hubzilla-107f80892a19f0ccd0cd30a0e3fc5ce3a41829b7.tar.bz2
volse-hubzilla-107f80892a19f0ccd0cd30a0e3fc5ce3a41829b7.zip
UNO: Hide bookmark tools in items (#^ and in menu)
-rw-r--r--include/ItemObject.php2
-rw-r--r--include/bbcode.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index da019a30a..d42e993e6 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -241,7 +241,7 @@ class Item extends BaseObject {
$has_bookmarks = false;
if(is_array($item['term'])) {
foreach($item['term'] as $t) {
- if($t['type'] == TERM_BOOKMARK)
+ if(!UNO && $t['type'] == TERM_BOOKMARK)
$has_bookmarks = true;
}
}
diff --git a/include/bbcode.php b/include/bbcode.php
index 477436475..eefe7fe98 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -593,6 +593,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" >$1</a>', $Text);
$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" >$2</a>', $Text);
}
+
+ // Remove bookmarks from UNO
+ if (UNO)
+ $Text = str_replace('<span class="bookmark-identifier">#^</span>', '', $Text);
+
// Perform MAIL Search
if (strpos($Text,'[/mail]') !== false) {
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1" target="_blank" >$1</a>', $Text);