diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-09 23:13:15 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-09 23:13:15 +0100 |
| commit | 766a7fb1b46a506e92d62ed0b76e0e0e3e6958a5 (patch) | |
| tree | 81e1a5fc1d52839f8735acbba23064027fece2ac | |
| parent | 40a7446e3e1d52fa015ac9f2ce45b0c2b8df520f (diff) | |
| parent | 40c625158f879c51bac8c1e2271eb0505dff991d (diff) | |
| download | volse-hubzilla-766a7fb1b46a506e92d62ed0b76e0e0e3e6958a5.tar.gz volse-hubzilla-766a7fb1b46a506e92d62ed0b76e0e0e3e6958a5.tar.bz2 volse-hubzilla-766a7fb1b46a506e92d62ed0b76e0e0e3e6958a5.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Cloud_tiles.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 2 | ||||
| -rw-r--r-- | include/security.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Zotlabs/Module/Cloud_tiles.php b/Zotlabs/Module/Cloud_tiles.php index 45124cdfa..da551904f 100644 --- a/Zotlabs/Module/Cloud_tiles.php +++ b/Zotlabs/Module/Cloud_tiles.php @@ -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))); } diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d6a01af11..2d2d8e2b7 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -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']) { diff --git a/include/security.php b/include/security.php index 450cc4f69..8b7e7d076 100644 --- a/include/security.php +++ b/include/security.php @@ -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]; } diff --git a/include/zot.php b/include/zot.php index 0aa50ab92..40e303bf1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -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; } |