aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-09 20:07:09 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-09 20:07:09 -0400
commit7a242f829fac2b434726c2bbdca5dbf658404c76 (patch)
tree5b7b4d086dccac5017fcb31211a27d689cb8e21f
parent9410b63bbc819955964706c876bc2f7ecea10adf (diff)
parentee5372784e129ed7a162c7433f56fa3a1e877a67 (diff)
downloadvolse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.tar.gz
volse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.tar.bz2
volse-hubzilla-7a242f829fac2b434726c2bbdca5dbf658404c76.zip
Merge remote-tracking branch 'upstream/dev' into wiki
-rw-r--r--Zotlabs/Daemon/Notifier.php6
-rw-r--r--Zotlabs/Module/Rmagic.php8
-rwxr-xr-xboot.php7
-rw-r--r--include/api.php5
-rw-r--r--view/js/main.js16
5 files changed, 21 insertions, 21 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 590be31ee..ebc9d83a5 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -278,7 +278,11 @@ class Notifier {
logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
return;
}
- if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || intval($target_item['item_hidden'])) {
+
+ // Check for non published items, but allow an exclusion for transmitting hidden file activities
+
+ if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
+ ( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
return;
}
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php
index bcdbf6c90..26b0c46a6 100644
--- a/Zotlabs/Module/Rmagic.php
+++ b/Zotlabs/Module/Rmagic.php
@@ -24,7 +24,7 @@ class Rmagic extends \Zotlabs\Web\Controller {
}
}
- function post() {
+ function post() {
$address = trim($_REQUEST['address']);
@@ -34,13 +34,13 @@ class Rmagic extends \Zotlabs\Web\Controller {
try {
require_once('library/openid/openid.php');
- $openid = new LightOpenID(z_root());
+ $openid = new \LightOpenID(z_root());
$openid->identity = $address;
$openid->returnUrl = z_root() . '/openid';
$openid->required = array('namePerson/friendly', 'namePerson');
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
goaway($openid->authUrl());
- } catch (Exception $e) {
+ } catch (\Exception $e) {
notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
}
@@ -82,7 +82,7 @@ class Rmagic extends \Zotlabs\Web\Controller {
}
- function get() {
+ function get() {
$o = replace_macros(get_markup_template('rmagic.tpl'),array(
'$title' => t('Remote Authentication'),
diff --git a/boot.php b/boot.php
index f7df2d74b..8e789a77f 100755
--- a/boot.php
+++ b/boot.php
@@ -1466,6 +1466,12 @@ function check_config(&$a) {
@unlink($lockfile);
//send the administrator an e-mail
file_put_contents($lockfile, $x);
+
+ $r = q("select account_language from account where account_email = '%s' limit 1",
+ dbesc(App::$config['system']['admin_email'])
+ );
+ push_lang(($r) ? $r[0]['account_language'] : 'en');
+
$email_tpl = get_intltext_template("update_fail_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
@@ -1483,6 +1489,7 @@ function check_config(&$a) {
. 'Content-transfer-encoding: 8bit' );
//try the logger
logger('CRITICAL: Update Failed: ' . $x);
+ pop_lang();
}
else
set_config('database','update_r' . $x, 'success');
diff --git a/include/api.php b/include/api.php
index f0d886d9b..be525f7e9 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1904,10 +1904,15 @@ require_once('include/api_auth.php');
$ret = array();
+ $x = array('items' => $r,'api_user' => api_user(),'user_info' => $user_info);
+ call_hooks('api_format_items',$x);
+ $r = $x['items'];
+
if(! $r)
return $ret;
foreach($r as $item) {
+
localize_item($item);
$status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($a,$item));
diff --git a/view/js/main.js b/view/js/main.js
index 15a6b4b8d..f279417d9 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -321,22 +321,6 @@ $(function() {
return false;
}
}
- if(event.keyCode == '34') {
- if((pageHasMoreContent) && (! loadingPage)) {
- $('#more').hide();
- $('#no-more').hide();
-
- next_page++;
- scroll_next = true;
- loadingPage = true;
-
- if(($('.directory-end').length == 0) && ($('.photos-end').length == 0))
- liveUpdate();
- else
- pageUpdate();
- return true;
- }
- }
if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
event.preventDefault();