aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-26 16:29:06 -0800
committerfriendica <info@friendica.com>2012-02-26 16:29:06 -0800
commita1861d1128aacc1ab98b33a1d035bfc27c9979f5 (patch)
treedba8837a8c4bc20a00eeb731dc1312c9d9f4781a /include
parent89560edde2fe3fb198b558479e9c2300fc4185fd (diff)
downloadvolse-hubzilla-a1861d1128aacc1ab98b33a1d035bfc27c9979f5.tar.gz
volse-hubzilla-a1861d1128aacc1ab98b33a1d035bfc27c9979f5.tar.bz2
volse-hubzilla-a1861d1128aacc1ab98b33a1d035bfc27c9979f5.zip
tagging missing from wallwall and a couple of themes, star missing from dispy
Diffstat (limited to 'include')
-rwxr-xr-xinclude/conversation.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 53369cf20..2ef37694d 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,6 +6,11 @@
function localize_item(&$item){
$Text = $item['body'];
+
+
+ // find private image (w/data url) if present and convert image
+ // link to a magic-auth redirect.
+
$saved_image = '';
$img_start = strpos($Text,'[img]data:');
$img_end = strpos($Text,'[/img]');
@@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$toplevelprivate = false;
// Take care of author collapsing and comment collapsing
+ // (author collapsing is currently disabled)
// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
// If there are more than two comments, squash all but the last 2.
@@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
- /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+ // DISABLED
+ /*
+ if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
$blowhard_count ++;
if($blowhard_count == 3) {
$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
@@ -424,7 +432,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if($blowhard_count >= 3)
$o .= '</div>';
$blowhard_count = 0;
- }*/
+ }
+ // END DISABLED
+ */
$comments_seen = 0;
$comments_collapsed = false;