harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

couple of minor issues with dba namespace during install and enotify::format referencing an unknown variable

Browse Source
This commit is contained in:
redmatrix 2016-09-18 17:35:11 -07:00
parent 0754da58da
commit 44d945cd08
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zotlabs/Lib/Enotify.php
View File

@ -116,10 +116,13 @@ class Enotify {
$itemlink = $params['link']; $itemlink = $params['link'];
// ignore like/unlike activity on posts - they probably require a sepearate notification preference // ignore like/unlike activity on posts - they probably require a separate notification preference
if (array_key_exists('item',$params) && (! visible_activity($params['item']))) if (array_key_exists('item',$params) && (! visible_activity($params['item']))) {
logger('notification: not a visible activity. Ignoring.');
pop_lang();
return; return;
}
$parent_mid = $params['parent_mid']; $parent_mid = $params['parent_mid'];
@ -386,8 +389,11 @@ class Enotify {
// Mark some notifications as seen right away // Mark some notifications as seen right away
// Note! The notification have to be created, because they are used to send emails // Note! The notification have to be created, because they are used to send emails
// So easiest solution to hide them from Notices is to mark them as seen right away. // So easiest solution to hide them from Notices is to mark them as seen right away.
// Another option would be to not add them to the DB, and change how emails are handled (probably would be better that way) // Another option would be to not add them to the DB, and change how emails are handled
// (probably would be better that way)
$always_show_in_notices = get_pconfig($recip['channel_id'],'system','always_show_in_notices'); $always_show_in_notices = get_pconfig($recip['channel_id'],'system','always_show_in_notices');
if (!$always_show_in_notices) { if (!$always_show_in_notices) {
if (($params['type'] == NOTIFY_WALL) || ($params['type'] == NOTIFY_MAIL) || ($params['type'] == NOTIFY_INTRO)) { if (($params['type'] == NOTIFY_WALL) || ($params['type'] == NOTIFY_MAIL) || ($params['type'] == NOTIFY_INTRO)) {
$seen = 1; $seen = 1;
@ -654,12 +660,12 @@ class Enotify {
require_once('include/conversation.php'); require_once('include/conversation.php');
// Call localize_item with the "brief" flag to get a one line status for activities. // Call localize_item to get a one line status for activities.
// This should set $item['localized'] to indicate we have a brief summary. // This should set $item['localized'] to indicate we have a brief summary.
localize_item($item); localize_item($item);
if($item_localize) { if($item['localize']) {
$itemem_text = $item['localize']; $itemem_text = $item['localize'];
} }
else { else {

2
Zotlabs/Module/Setup.php
View File

@ -87,7 +87,7 @@ class Setup extends \Zotlabs\Web\Controller {
$db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true); $db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
if(! \DBA::$dba->connected) { if(! \DBA::$dba->connected) {
echo 'Database Connect failed: ' . DBA::$dba->error; echo 'Database Connect failed: ' . \DBA::$dba->error;
killme(); killme();
} }
return; return;