diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
| commit | a2ee5ebe427522228dc03dc81da11f348a399c4d (patch) | |
| tree | 8bffe9c8c9abe370523816f7742e6e26364fa5b5 /include | |
| parent | 8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 (diff) | |
| parent | a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 (diff) | |
| download | volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.gz volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.bz2 volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Conflicts:
addon/twitter/twitter.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/poller.php | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9467531d9..fa700818f 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -10,7 +10,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n"; $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", - $_SESSION['uid'] + intval(local_user()) ); diff --git a/include/items.php b/include/items.php index f38c0938f..e930ab5d2 100644 --- a/include/items.php +++ b/include/items.php @@ -609,6 +609,7 @@ function item_store($arr,$force_parent = false) { else { // find the parent and snarf the item id and ACL's + // and anything else we need to inherit $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($arr['parent-uri']), @@ -632,6 +633,7 @@ function item_store($arr,$force_parent = false) { $allow_gid = $r[0]['allow_gid']; $deny_cid = $r[0]['deny_cid']; $deny_gid = $r[0]['deny_gid']; + $arr['wall'] = $r[0]['wall']; } else { diff --git a/include/poller.php b/include/poller.php index fd02e0198..a093190a6 100644 --- a/include/poller.php +++ b/include/poller.php @@ -47,6 +47,11 @@ function poller_run($argv, $argc){ $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); + $d = datetime_convert(); + call_hooks('cron', $d); + + reload_plugins(); + $contacts = q("SELECT `id` FROM `contact` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' $sql_extra |