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

fix some merge errors

Browse Source
This commit is contained in:
redmatrix 2015-05-18 17:20:59 -07:00
parent 71a2f2d773
commit 4c319a98a8
3 changed files with 1329 additions and 1071 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/notifier.php
View File

@ -336,7 +336,7 @@ function notifier_run($argv, $argc){
$target_item = $r[0]; $target_item = $r[0];
$deleted_item = false; $deleted_item = false;
if(intval($target_item['item_deleted'])) if(intval($target_item['item_deleted'])) {
logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG); logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
$deleted_item = true; $deleted_item = true;
} }

6
mod/dirsearch.php
View File

@ -245,10 +245,12 @@ function dirsearch_content(&$a) {
json_return_and_die($spkt); json_return_and_die($spkt);
} }
else { else {
$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql $order $qlimit ", $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash
where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0
$safesql $order $qlimit "
);
$ret['page'] = $page + 1; $ret['page'] = $page + 1;
$ret['records'] = count($r); $ret['records'] = count($r);
);
} }

2392
util/strings.php
View File

File diff suppressed because it is too large Load Diff