diff --git a/doc/Config.md b/doc/Config.md index a187331dd..7eae371c2 100644 --- a/doc/Config.md +++ b/doc/Config.md @@ -142,7 +142,7 @@ $a->config['register_policy'] = REGISTER_CLOSED; 
 'config' => [
-    'register_policty' => REGISTER_CLOSED,
+    'register_policy' => \Friendica\Module\Register::CLOSED,
 ],
@@ -242,7 +242,7 @@ register_policty = REGISTER_CLOSED 
 'config' => [
-    'register_policty' => REGISTER_CLOSED,
+    'register_policy' => \Friendica\Module\Register::CLOSED,
 ],
diff --git a/mod/admin.php b/mod/admin.php index cc2256b73..7723a5155 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -936,6 +936,10 @@ function admin_page_summary(App $a) $showwarning = true; $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); } + if (file_exists('config/local.ini.php')) { + $showwarning = true; + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + } // Check server vitality if (!admin_page_server_vital()) { @@ -1104,7 +1108,7 @@ function admin_page_site_post(App $a) $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); $shortcut_icon = (!empty($_POST['shortcut_icon']) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : ''); $touch_icon = (!empty($_POST['touch_icon']) ? Strings::escapeTags(trim($_POST['touch_icon'])) : ''); - $info = (!empty($_POST['info']) ? trim($_POST['info']) : false); + $additional_info = (!empty($_POST['additional_info']) ? trim($_POST['additional_info']) : ''); $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); $theme = (!empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : ''); $theme_mobile = (!empty($_POST['theme_mobile']) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : ''); @@ -1300,10 +1304,10 @@ function admin_page_site_post(App $a) Config::set('system', 'banner', $banner); } - if (empty($info)) { + if (empty($additional_info)) { Config::delete('config', 'info'); } else { - Config::set('config', 'info', $info); + Config::set('config', 'info', $additional_info); } Config::set('system', 'language', $language); Config::set('system', 'theme', $theme); @@ -1501,7 +1505,7 @@ function admin_page_site(App $a) $banner = 'logoFriendica'; } - $info = Config::get('config', 'info'); + $additional_info = Config::get('config', 'info'); // Automatically create temporary paths get_temppath(); @@ -1594,7 +1598,7 @@ function admin_page_site(App $a) '$banner' => ['banner', L10n::t("Banner/Logo"), $banner, ""], '$shortcut_icon' => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system', 'shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")], '$touch_icon' => ['touch_icon', L10n::t("Touch icon"), Config::get('system', 'touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")], - '$info' => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], + '$additional_info' => ['additional_info', L10n::t('Additional Info'), $additional_info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], '$language' => ['language', L10n::t("System language"), Config::get('system', 'language'), "", $lang_choices], '$theme' => ['theme', L10n::t("System theme"), Config::get('system', 'theme'), L10n::t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], '$theme_mobile' => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile], diff --git a/mod/babel.php b/mod/babel.php index 64c955776..6e47b8108 100644 --- a/mod/babel.php +++ b/mod/babel.php @@ -72,6 +72,21 @@ function babel_content() 'title' => L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'), 'content' => visible_whitespace($bbcode4) ]; + + $item = [ + 'body' => $bbcode, + 'tag' => '', + ]; + + \Friendica\Model\Item::setHashtags($item); + $results[] = [ + 'title' => L10n::t('Item Body'), + 'content' => visible_whitespace($item['body']) + ]; + $results[] = [ + 'title' => L10n::t('Item Tags'), + 'content' => $item['tag'] + ]; break; case 'markdown': $markdown = trim($_REQUEST['text']); diff --git a/mod/help.php b/mod/help.php index 3df280dbd..cdfedac6f 100644 --- a/mod/help.php +++ b/mod/help.php @@ -84,7 +84,7 @@ function help_content(App $a) $level = intval($level); if ($level < $lastlevel) { for ($k = $level; $k < $lastlevel; $k++) { - $toc .= ""; + $toc .= ""; } for ($k = $level + 1; $k < count($idnum); $k++) { @@ -93,7 +93,7 @@ function help_content(App $a) } if ($level > $lastlevel) { - $toc .= "