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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-11-09 23:13:15 +01:00
commit 766a7fb1b4
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Cloud_tiles.php
View File

@ -11,6 +11,10 @@ class Cloud_tiles extends \Zotlabs\Web\Controller {
else
$_SESSION['cloud_tiles'] = 1;
if(local_channel()) {
set_pconfig(local_channel(),'system','cloud_tiles',$_SESSION['cloud_tiles']);
}
goaway(z_root() . '/' . hex2bin(argv(1)));
}

2
Zotlabs/Module/Wiki.php
View File

@ -494,7 +494,7 @@ class Wiki extends \Zotlabs\Web\Controller {
return; //not reached
}
$wiki = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $arr['urlName']);
$wiki = Zlib\NativeWiki::exists_by_name($owner['channel_id'], urldecode($arr['urlName']));
if($wiki['resource_id']) {

1
include/security.php
View File

@ -264,6 +264,7 @@ function change_channel($change_channel) {
App::set_channel($r[0]);
$_SESSION['theme'] = $r[0]['channel_theme'];
$_SESSION['mobile_theme'] = get_pconfig(local_channel(),'system', 'mobile_theme');
$_SESSION['cloud_tiles'] = get_pconfig(local_channel(),'system', 'cloud_tiles');
date_default_timezone_set($r[0]['channel_timezone']);
$ret = $r[0];
}

3
include/zot.php
View File

@ -2010,8 +2010,7 @@ function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) {
// may have a different owner than the one being transmitted.
if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) {
/// @fixme shouldn't this be logger?
notice('sender is not owner or author');
logger('sender is not owner or author');
return;
}