aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-02-26 20:40:41 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-02-26 20:40:41 +0000
commit792abc3a24d13408d4e31a4137a8173e3039bd8e (patch)
tree3e0037e94e0ba7c4a3d56bb3ddbe958dca84c1c7 /mod
parentfd9c12128afba39d91b81371b240e0cd92f66469 (diff)
downloadvolse-hubzilla-792abc3a24d13408d4e31a4137a8173e3039bd8e.tar.gz
volse-hubzilla-792abc3a24d13408d4e31a4137a8173e3039bd8e.tar.bz2
volse-hubzilla-792abc3a24d13408d4e31a4137a8173e3039bd8e.zip
necessare fields not loaded from DB
Diffstat (limited to 'mod')
-rwxr-xr-xmod/acl.php4
-rw-r--r--mod/ping.php5
2 files changed, 6 insertions, 3 deletions
diff --git a/mod/acl.php b/mod/acl.php
index 98ca90ded..375c618c8 100755
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -16,6 +16,8 @@ function acl_init(&$a){
if ($search!=""){
$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+ } else {
+ $sql_extra = $sql_extra2 = "";
}
// count groups and contacts
@@ -75,7 +77,7 @@ function acl_init(&$a){
if ($type=='' || $type=='c'){
- $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact`
+ $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
$sql_extra2
ORDER BY `name` ASC ",
diff --git a/mod/ping.php b/mod/ping.php
index 0f6f0a9d6..7380ff7d0 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -26,9 +26,10 @@ function ping_init(&$a) {
$dislikes = array();
$friends = array();
$posts = array();
-
+ $home = 0;
+ $network = 0;
- $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`