diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connedit.php | 1 | ||||
| -rw-r--r-- | mod/help.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 17 |
3 files changed, 13 insertions, 7 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 917e2c73b..5bf9c130b 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -504,6 +504,7 @@ function connedit_content(&$a) { $slider_tpl = get_markup_template('contact_slider.tpl'); $slide = replace_macros($slider_tpl,array( '$me' => t('Me'), + '$min' => 1, '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), '$intimate' => t('Best Friends'), '$friends' => t('Friends'), diff --git a/mod/help.php b/mod/help.php index 4823f1c07..a3dafcc9b 100644 --- a/mod/help.php +++ b/mod/help.php @@ -98,7 +98,7 @@ function preg_callback_help_include($matches) { if($matches[1]) { $include = str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); - if(preg_match('/\.bb$/', $matches[1])) { + if(preg_match('/\.bb$/', $matches[1]) || preg_match('/\.txt$/', $matches[1])) { require_once('include/bbcode.php'); $include = bbcode($include); } elseif(preg_match('/\.md$/', $matches[1])) { diff --git a/mod/settings.php b/mod/settings.php index ab6638ccb..1643387ea 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -763,13 +763,18 @@ function settings_content(&$a) { $is_experimental = file_exists('view/theme/' . $th . '/experimental'); $unsupported = file_exists('view/theme/' . $th . '/unsupported'); $is_mobile = file_exists('view/theme/' . $th . '/mobile'); + $is_library = file_exists('view/theme/'. $th . '/library'); + if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ $theme_name = (($is_experimental) ? sprintf(t('%s - (Experimental)'), $f) : $f); - if($is_mobile) { - $mobile_themes[$f]=$theme_name; - } - else { - $themes[$f]=$theme_name; + + if (! $is_library) { + if($is_mobile) { + $themes[$f]=$theme_name . ' (' . t('mobile') . ')'; + } + else { + $themes[$f]=$theme_name; + } } } } @@ -807,7 +812,7 @@ function settings_content(&$a) { '$uid' => local_user(), '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'), - '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''), + '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $themes, ''), '$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, ''), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), '$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')), |