harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into wiki

Browse Source
This commit is contained in:
Andrew Manning 2016-06-09 20:07:09 -04:00
commit 7a242f829f
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Daemon/Notifier.php
View File

@ -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;
}

8
Zotlabs/Module/Rmagic.php
View File

@ -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'),

7
boot.php
View File

@ -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');

5
include/api.php
View File

@ -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));

16
view/js/main.js
View File

@ -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();