diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-09 01:09:41 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-09 01:09:41 -0700 |
| commit | 1b0b847fc80827022c513a74a7fa817c7d640da0 (patch) | |
| tree | 09a09da19a7eee4c5dc1100b89757e85d2bc8ab8 /mod | |
| parent | ddf4ef752077e66d34edb458cfe104ee23ef3834 (diff) | |
| parent | fc0576acf810019a0c168bfa4dc4a2175ae0b505 (diff) | |
| download | volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.tar.gz volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.tar.bz2 volse-hubzilla-1b0b847fc80827022c513a74a7fa817c7d640da0.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/cloud.php | 1 | ||||
| -rw-r--r-- | mod/import.php | 5 | ||||
| -rw-r--r-- | mod/oembed.php | 5 | ||||
| -rw-r--r-- | mod/siteinfo.php | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/mod/cloud.php b/mod/cloud.php index 28c59872d..149a6da5d 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -138,7 +138,6 @@ function cloud_init(&$a) { require_once('include/RedDAV/RedBrowser.php'); // provide a directory view for the cloud in Red Matrix $browser = new RedDAV\RedBrowser($auth); - $auth->setBrowserPlugin($browser); $server->addPlugin($browser); diff --git a/mod/import.php b/mod/import.php index e5a22a26e..3cf114d66 100644 --- a/mod/import.php +++ b/mod/import.php @@ -378,7 +378,10 @@ function import_post(&$a) { } } + $saved_notification_flags = notifications_off($channel['channel_id']); + if($import_posts && array_key_exists('item',$data) && $data['item']) { + foreach($data['item'] as $i) { $item = get_item_elements($i); @@ -404,6 +407,8 @@ function import_post(&$a) { } + notifications_on($channel['channel_id'],$saved_notification_flags); + if(array_key_exists('item_id',$data) && $data['item_id']) { foreach($data['item_id'] as $i) { $r = q("select id from item where mid = '%s' and uid = %d limit 1", diff --git a/mod/oembed.php b/mod/oembed.php index a053a8c98..d4a4424f5 100644 --- a/mod/oembed.php +++ b/mod/oembed.php @@ -19,9 +19,10 @@ function oembed_init(&$a){ else { echo "<html><body>"; - $j = oembed_fetch_url(base64url_decode(argv(1))); + $src = base64url_decode(argv(1)); + $j = oembed_fetch_url($src); echo $j->html; -// logger('mod-oembed ' . $j->html, LOGGER_ALL); +// logger('mod-oembed ' . $h, LOGGER_ALL); echo "</body></html>"; } } diff --git a/mod/siteinfo.php b/mod/siteinfo.php index de55c69cf..c1d65fadd 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -55,6 +55,7 @@ function siteinfo_init(&$a) { $channels_active_halfyear_stat = intval(get_config('system','channels_active_halfyear_stat')); $channels_active_monthly_stat = intval(get_config('system','channels_active_monthly_stat')); $local_posts_stat = intval(get_config('system','local_posts_stat')); + $hide_in_statistics = intval(get_config('system','hide_in_statistics')); $data = Array( 'version' => RED_VERSION, @@ -74,7 +75,8 @@ function siteinfo_init(&$a) { 'channels_total' => $channels_total_stat, 'channels_active_halfyear' => $channels_active_halfyear_stat, 'channels_active_monthly' => $channels_active_monthly_stat, - 'local_posts' => $local_posts_stat + 'local_posts' => $local_posts_stat, + 'hide_in_statistics' => $hide_in_statistics ); json_return_and_die($data); } |