diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-08 11:11:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-08 11:11:17 +0100 |
| commit | 0600817ef75d19d1ec91ba822f8a6938d442824e (patch) | |
| tree | 13794288d5ffca739248d9ec017ef1a4cef9b93d | |
| parent | 214fa81ec62eeb8a735d2196373c37e89d02666a (diff) | |
| download | volse-hubzilla-0600817ef75d19d1ec91ba822f8a6938d442824e.tar.gz volse-hubzilla-0600817ef75d19d1ec91ba822f8a6938d442824e.tar.bz2 volse-hubzilla-0600817ef75d19d1ec91ba822f8a6938d442824e.zip | |
fix regression in app categories
| -rw-r--r-- | Zotlabs/Module/Apps.php | 5 | ||||
| -rwxr-xr-x | view/tpl/myapps.tpl | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index 2f61f2932..c672ea467 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -22,7 +22,8 @@ class Apps extends \Zotlabs\Web\Controller { if(local_channel()) { Zlib\Apps::import_system_apps(); $syslist = array(); - $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $_GET['cat']); + $cat = ((array_key_exists('cat',$_GET) && $_GET['cat']) ? [ escape_tags($_GET['cat']) ] : ''); + $list = Zlib\Apps::app_list(local_channel(), (($mode == 'edit') ? true : false), $cat); if($list) { foreach($list as $x) { $syslist[] = Zlib\Apps::app_encode($x); @@ -43,7 +44,7 @@ class Apps extends \Zotlabs\Web\Controller { return replace_macros(get_markup_template('myapps.tpl'), array( '$sitename' => get_config('system','sitename'), - '$cat' => ((array_key_exists('cat',$_GET) && $_GET['cat']) ? escape_tags($_GET['cat']) : ''), + '$cat' => $cat, '$title' => t('Apps'), '$apps' => $apps, '$authed' => ((local_channel()) ? true : false), diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index dd2a67a63..0ac836b38 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -4,10 +4,10 @@ {{if $create}} <a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> {{else}} - <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> + <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} - <h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2> + <h2>{{$title}}{{if $cat.0}} - {{$cat.0}}{{/if}}</h2> </div> <div class="clearfix section-content-wrapper"> {{foreach $apps as $ap}} |