Merge branch 'fabrixxm-master'

This commit is contained in:
Friendika 2011-02-06 13:27:52 -08:00
commit 8e988341d0

View file

@ -84,7 +84,7 @@ function notifier_run($argv, $argc){
if($items[0]['deleted']) { if($items[0]['deleted']) {
foreach($items as $item) foreach($items as $item)
$item['deleted'] = 1; $item['deleted'] = 1;
}
} }
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`