]> git.mxchange.org Git - friendica.git/commitdiff
The "ignore" feature can be disabled and enabled, the value will now be retrieved.
authorMichael Vogel <icarus@dabo.de>
Wed, 3 Sep 2014 23:27:28 +0000 (01:27 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 3 Sep 2014 23:27:28 +0000 (01:27 +0200)
include/features.php
object/Item.php

index 24955ba104f72c18b37a4875bb4d946c944e98d1..091dfc6e9d0793a320ff3f33af0fc4841ab76272 100644 (file)
@@ -60,6 +60,7 @@ function get_features() {
                        array('filing',         t('Saved Folders'),                             t('Ability to file posts under folders')),
                        array('dislike',        t('Dislike Posts'),                             t('Ability to dislike posts/comments')),
                        array('star_posts',     t('Star Posts'),                                t('Ability to mark special posts with a star indicator')),
+                       array('ignore_posts',   t('Mute Post Notifications'),                   t('Ability to mute notifications for a thread')),
                ),
        );
 
index 90b0c3fea361c1d6e735f2a1633b353513ee85cb..19e3fdead1f2c7a09d2dab33ad04f06aa328b1f4 100644 (file)
@@ -199,14 +199,21 @@ class Item extends BaseObject {
                                        'classundo' => (($item['starred']) ? "" : "hidden"),
                                        'starred' =>  t('starred'),
                                );
-                               $ignore = array(
-                                       'do' => t("ignore thread"),
-                                       'undo' => t("unignore thread"),
-                                       'toggle' => t("toggle ignore status"),
-                                       'classdo' => (($item['starred']) ? "hidden" : ""),
-                                       'classundo' => (($item['starred']) ? "" : "hidden"),
-                                       'ignored' =>  t('ignored'),
+                               $r = q("SELECT `ignored` FROM `thread` WHERE `uid` = %d AND `iid` = %d LIMIT 1",
+                                       intval($item['uid']),
+                                       intval($item['id'])
                                );
+                               if (count($r)) {
+                                       $ignore = array(
+                                               'do' => t("ignore thread"),
+                                               'undo' => t("unignore thread"),
+                                               'toggle' => t("toggle ignore status"),
+                                               'classdo' => (($r[0]['ignored']) ? "hidden" : ""),
+                                               'classundo' => (($r[0]['ignored']) ? "" : "hidden"),
+                                               'ignored' =>  t('ignored'),
+                                       );
+                               }
+
                                $tagger = '';
                                if(feature_enabled($conv->get_profile_owner(),'commtag')) {
                                        $tagger = array(
@@ -344,8 +351,7 @@ class Item extends BaseObject {
                        'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
                        'isstarred' => $isstarred,
                        'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
-                       /* 'ignore'      => ((feature_enabled($conv->get_profile_owner(),'ignore_posts')) ? $ignore : ''), */
-                       'ignore'      => $ignore,
+                       'ignore'      => ((feature_enabled($conv->get_profile_owner(),'ignore_posts')) ? $ignore : ''),
                        'tagger'        => $tagger,
                        'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
                        'drop' => $drop,