diff options
| author | friendica <info@friendica.com> | 2014-05-21 17:23:34 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-21 17:23:34 -0700 |
| commit | d17768d4e7b7f07dfd2f4326f79fa8b1f9a74582 (patch) | |
| tree | 1cb7bf698e713a4a784a579c4dd6db9d7b00167c | |
| parent | a6602a9871a918702a5ccbcae121920cf959129c (diff) | |
| download | volse-hubzilla-d17768d4e7b7f07dfd2f4326f79fa8b1f9a74582.tar.gz volse-hubzilla-d17768d4e7b7f07dfd2f4326f79fa8b1f9a74582.tar.bz2 volse-hubzilla-d17768d4e7b7f07dfd2f4326f79fa8b1f9a74582.zip | |
change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content.
| -rw-r--r-- | include/language.php | 4 | ||||
| -rw-r--r-- | include/nav.php | 5 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 9 |
3 files changed, 7 insertions, 11 deletions
diff --git a/include/language.php b/include/language.php index 780dfadba..cfaa855dd 100644 --- a/include/language.php +++ b/include/language.php @@ -214,8 +214,10 @@ function detect_language($s) { if($min_confidence === false) $min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE; + // embedded apps have long base64 strings which will trip up the detector. + $naked_body = preg_replace('/\[app\](.*?)\[\/app\]/','',$s); // strip off bbcode - $naked_body = preg_replace('/\[(.+?)\]/', '', $s); + $naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body); if(mb_strlen($naked_body) < intval($min_length)) { logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA); return ''; diff --git a/include/nav.php b/include/nav.php index a97b434bc..2d0d43d5a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -138,8 +138,8 @@ EOT; if(! get_config('system','hide_help')) $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); - if(count($a->get_apps()) > 0) - $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games')); + + $nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games')); $nav['search'] = array('search', t('Search'), "", t('Search site content')); @@ -221,7 +221,6 @@ EOT; '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, - '$apps' => $a->get_apps(), '$pleasewait' => t('Please wait...') )); diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5aa3b0f01..6b76ff5b6 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -157,13 +157,8 @@ {{/if}} {{if $nav.apps}} - <li class="{{$sel.apps}} hidden-xs"> - <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> - <ul class="dropdown-menu"> - {{foreach $apps as $ap}} - <li role="presentation">{{$ap}}</li> - {{/foreach}} - </ul> + <li class="{{$sel.apps}}"> + <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> </li> {{/if}} |