diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-26 14:52:45 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-26 14:52:45 -0700 |
| commit | 1b75e4de0db02389108aba2b89830f7804f289f4 (patch) | |
| tree | 2b9ff0ec369a432c7d6da2333d293ca9b3357f63 | |
| parent | 2deafa0deab1dc8696cd1e1c2d93aece8ac24338 (diff) | |
| download | volse-hubzilla-1b75e4de0db02389108aba2b89830f7804f289f4.tar.gz volse-hubzilla-1b75e4de0db02389108aba2b89830f7804f289f4.tar.bz2 volse-hubzilla-1b75e4de0db02389108aba2b89830f7804f289f4.zip | |
hubzilla issue #795
| -rw-r--r-- | Zotlabs/Module/Editwebpage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Webpages.php | 6 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 3effe7ff5..da536a729 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -112,7 +112,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { intval($itm[0]['id']) ); if($item_id) - $page_title = str_replace('%2f','/',$item_id[0]['v']); + $page_title = urldecode($item_id[0]['v']); $mimetype = $itm[0]['mimetype']; diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index be697ba2c..a8fd5222b 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -218,13 +218,15 @@ class Webpages extends \Zotlabs\Web\Controller { 'created' => $rr['created'], 'edited' => $rr['edited'], 'mimetype' => $rr['mimetype'], - 'pagetitle' => str_replace('%2f','/',$rr['v']), + 'pageurl' => str_replace('%2f','/',$rr['v']), + 'pagetitle' => urldecode($rr['v']), 'mid' => $rr['mid'], 'layout_mid' => $rr['layout_mid'] ); $pages[$rr['iid']][] = array( 'url' => $rr['iid'], - 'pagetitle' => str_replace('%2f','/',$rr['v']), + 'pageurl' => str_replace('%2f','/',$rr['v']), + 'pagetitle' => urldecode($rr['v']), 'title' => $rr['title'], 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index fcf9de75a..1c909b9b8 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -31,7 +31,7 @@ <tr id="webpage-list-item-{{$item.url}}"> <td> {{if $view}} - <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a> + <a href="page/{{$channel}}/{{$item.pageurl}}" title="{{$view}}">{{$item.pagetitle}}</a> {{else}} {{$item.pagetitle}} {{/if}} |