diff options
| author | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
| commit | a4c3058f845a1c38d06b2201a10700c5f878366d (patch) | |
| tree | bab86468397e523457ba25199cb9a67265980e00 /include/apps.php | |
| parent | 32522b61f235266384c81c0669fceaf58afeb4fe (diff) | |
| parent | 6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff) | |
| download | volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2 volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip | |
Merge pull request #7 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/apps.php')
| -rw-r--r-- | include/apps.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/apps.php b/include/apps.php index 661fc2163..0a62dc5a8 100644 --- a/include/apps.php +++ b/include/apps.php @@ -130,7 +130,7 @@ function translate_system_apps(&$arr) { 'Address Book' => t('Address Book'), 'Login' => t('Login'), 'Channel Manager' => t('Channel Manager'), - 'Matrix' => t('Matrix'), + 'Grid' => t('Grid'), 'Settings' => t('Settings'), 'Files' => t('Files'), 'Webpages' => t('Webpages'), @@ -176,14 +176,19 @@ function app_render($papp,$mode = 'view') { $installed = false; - if(! $papp['photo']) - $papp['photo'] = z_root() . '/' . get_default_profile_photo(80); - if(! $papp) return; + if(! $papp['photo']) + $papp['photo'] = z_root() . '/' . get_default_profile_photo(80); + + + $papp['papp'] = papp_encode($papp); + if(! strstr($papp['url'],'://')) + $papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url']; + foreach($papp as $k => $v) { if(strpos($v,'http') === 0 && $k != 'papp') $papp[$k] = zid($v); |