diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-06 22:25:53 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-06 22:25:53 +0200 |
| commit | e7c8012794ffe6ac746223a9d67fa338f7360c57 (patch) | |
| tree | 97828d2de03ba479130e49828c21e3d88033fa76 | |
| parent | 9bd30eb8bf0299e62a975f4f8ba0a868e5789417 (diff) | |
| download | volse-hubzilla-e7c8012794ffe6ac746223a9d67fa338f7360c57.tar.gz volse-hubzilla-e7c8012794ffe6ac746223a9d67fa338f7360c57.tar.bz2 volse-hubzilla-e7c8012794ffe6ac746223a9d67fa338f7360c57.zip | |
no need to move $modrated check up
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Moderate.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 6513bcda7..e82c11a35 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -97,7 +97,6 @@ class Enotify { $title = $i['title']; $body = $i['body']; $private = (($i['item_private']) || intval($i['item_obscured'])); - $moderated = (($i['item_blocked'] == ITEM_MODERATED) ? true : false); } else { $title = $params['item']['title']; @@ -131,7 +130,9 @@ class Enotify { if ($params['type'] == NOTIFY_COMMENT) { // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); - $itemlink = $params['link']; + $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); + + $itemlink = $params['link']; // ignore like/unlike activity on posts - they probably require a separate notification preference diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php index 9af43420d..8aaa0897a 100644 --- a/Zotlabs/Module/Moderate.php +++ b/Zotlabs/Module/Moderate.php @@ -73,4 +73,4 @@ class Moderate extends \Zotlabs\Web\Controller { } -}
\ No newline at end of file +} |