diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-09 18:36:40 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-09 18:36:40 -0800 |
| commit | 71a30cd9a5f5c749e3b76e961876afbd0afa87f9 (patch) | |
| tree | 81e1a5fc1d52839f8735acbba23064027fece2ac /Zotlabs | |
| parent | ef27a1ce6c3cdb6f08584e76fa0c012377cadc49 (diff) | |
| parent | 766a7fb1b46a506e92d62ed0b76e0e0e3e6958a5 (diff) | |
| download | volse-hubzilla-71a30cd9a5f5c749e3b76e961876afbd0afa87f9.tar.gz volse-hubzilla-71a30cd9a5f5c749e3b76e961876afbd0afa87f9.tar.bz2 volse-hubzilla-71a30cd9a5f5c749e3b76e961876afbd0afa87f9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Cloud_tiles.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 1 |
3 files changed, 6 insertions, 1 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/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index a857f1ad9..191f2afb6 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -139,6 +139,7 @@ class Notifications { } $o = replace_macros(get_markup_template('notifications_widget.tpl'), array( + '$module' => \App::$module, '$notifications' => $notifications, '$loading' => t('Loading...') )); |