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

hubzilla issue #795

Browse Source
This commit is contained in:
zotlabs 2017-05-26 14:52:45 -07:00
parent 31d9208172
commit 184f522d5f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Editwebpage.php
View File

@ -112,7 +112,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
intval($itm[0]['id']) intval($itm[0]['id'])
); );
if($item_id) if($item_id)
$page_title = str_replace('%2f','/',$item_id[0]['v']); $page_title = urldecode($item_id[0]['v']);
$mimetype = $itm[0]['mimetype']; $mimetype = $itm[0]['mimetype'];

6
Zotlabs/Module/Webpages.php
View File

@ -218,13 +218,15 @@ class Webpages extends \Zotlabs\Web\Controller {
'created' => $rr['created'], 'created' => $rr['created'],
'edited' => $rr['edited'], 'edited' => $rr['edited'],
'mimetype' => $rr['mimetype'], 'mimetype' => $rr['mimetype'],
'pagetitle' => str_replace('%2f','/',$rr['v']), 'pageurl' => str_replace('%2f','/',$rr['v']),
'pagetitle' => urldecode($rr['v']),
'mid' => $rr['mid'], 'mid' => $rr['mid'],
'layout_mid' => $rr['layout_mid'] 'layout_mid' => $rr['layout_mid']
); );
$pages[$rr['iid']][] = array( $pages[$rr['iid']][] = array(
'url' => $rr['iid'], 'url' => $rr['iid'],
'pagetitle' => str_replace('%2f','/',$rr['v']), 'pageurl' => str_replace('%2f','/',$rr['v']),
'pagetitle' => urldecode($rr['v']),
'title' => $rr['title'], 'title' => $rr['title'],
'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),

2
view/tpl/webpagelist.tpl
View File

@ -31,7 +31,7 @@
<tr id="webpage-list-item-{{$item.url}}"> <tr id="webpage-list-item-{{$item.url}}">
<td> <td>
{{if $view}} {{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}} {{else}}
{{$item.pagetitle}} {{$item.pagetitle}}
{{/if}} {{/if}}