aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-17 19:22:24 -0800
committerfriendica <info@friendica.com>2013-11-17 19:22:24 -0800
commit13538cdd21c6e13a2ff108f1b42dbecaab8b375a (patch)
treeb9d67c87b02bf7d5b823cbe2eb3d5a381e2cd3bd /mod
parent772e3795bf1513b5f8ac3ab520c6c8cdb68de3af (diff)
downloadvolse-hubzilla-13538cdd21c6e13a2ff108f1b42dbecaab8b375a.tar.gz
volse-hubzilla-13538cdd21c6e13a2ff108f1b42dbecaab8b375a.tar.bz2
volse-hubzilla-13538cdd21c6e13a2ff108f1b42dbecaab8b375a.zip
pull in some posts when we first connect with a new channel (if allowed to) - if not allowed to, do it if that condition changes
Diffstat (limited to 'mod')
-rw-r--r--mod/follow.php6
-rw-r--r--mod/item.php8
-rw-r--r--mod/network.php4
3 files changed, 8 insertions, 10 deletions
diff --git a/mod/follow.php b/mod/follow.php
index 1d29dab2e..364fe76b9 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -24,6 +24,12 @@ function follow_init(&$a) {
info( t('Channel added.') . EOL);
+ // If we can view their stream, pull in some posts
+
+ if($result['abook']['abook_their_perms'] & PERMS_R_STREAM)
+ proc_run('php','include/onepoll.php',$result['abook']['abook_id']);
+
+
goaway(z_root() . '/connections/' . $result['abook']['abook_id']);
}
diff --git a/mod/item.php b/mod/item.php
index b564c7545..7eebbe287 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -774,14 +774,6 @@ function item_post(&$a) {
// NOTREACHED
}
- // update the commented timestamp on the parent
-
- q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($parent)
- );
-
$page_type = '';
if($webpage & ITEM_WEBPAGE)
diff --git a/mod/network.php b/mod/network.php
index 81b38a5ae..9ee21dc05 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -512,7 +512,7 @@ function network_content(&$a, $update = 0, $load = false) {
. "'; var profile_page = " . $a->pager['page'] . ";</script>";
-logger('Search: ' . $search);
+
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
'$baseurl' => z_root(),
@@ -734,7 +734,7 @@ logger('Search: ' . $search);
$o .= alt_pager($a,count($items));
if($load) {
- logger('mod_network: load: ' . count($items) . ' items', LOGGER_DATA);
+// logger('mod_network: load: ' . count($items) . ' items', LOGGER_DATA);
profiler($start,$first,'network parents');
profiler($first,$second,'network children');