aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-03 12:12:05 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-03 12:12:05 +0100
commitdce9a70ff59658249abeb58af46144eea16c721b (patch)
tree379a4c0a0c94a5a2c10563286da1c43c14ab42d6 /Zotlabs
parent631a8278d34da70ff312b0dcc11f8e486a4d4597 (diff)
downloadvolse-hubzilla-dce9a70ff59658249abeb58af46144eea16c721b.tar.gz
volse-hubzilla-dce9a70ff59658249abeb58af46144eea16c721b.tar.bz2
volse-hubzilla-dce9a70ff59658249abeb58af46144eea16c721b.zip
check for app-icons in app_list() instead of app_render()
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Apps.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 595cf33ee..c8345e351 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -339,12 +339,9 @@ class Apps {
}
$install_action = (($installed) ? t('Update') : t('Install'));
- $icon = ((strpos($papp['photo'],'icon:') === 0) ? substr($papp['photo'],5) : '');
-
return replace_macros(get_markup_template('app.tpl'),array(
'$app' => $papp,
- '$icon' => $icon,
'$hosturl' => $hosturl,
'$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''),
'$install' => (($hosturl && $mode == 'view') ? $install_action : ''),
@@ -512,8 +509,11 @@ class Apps {
intval(TERM_OBJ_APP),
intval($r[$x]['id'])
);
+
+ $r[$x]['app_icon'] = ((strpos($r[$x]['app_photo'],'icon:') === 0) ? substr($r[$x]['app_photo'],5) : '');
}
}
+
return($r);
}
@@ -719,6 +719,9 @@ class Apps {
if($app['app_photo'])
$ret['photo'] = $app['app_photo'];
+ if($app['app_icon'])
+ $ret['icon'] = $app['app_icon'];
+
if($app['app_version'])
$ret['version'] = $app['app_version'];