瀏覽代碼

Delete o_search_all_forums

Visman 3 年之前
父節點
當前提交
1a89c6b878

+ 0 - 1
app/Models/Pages/Admin/Install.php

@@ -1234,7 +1234,6 @@ class Install extends Admin
             'i_avatars_width'         => 60,
             'i_avatars_width'         => 60,
             'i_avatars_height'        => 60,
             'i_avatars_height'        => 60,
             'i_avatars_size'          => 10240,
             'i_avatars_size'          => 10240,
-            'o_search_all_forums'     => 1,
             'o_admin_email'           => $v->email,
             'o_admin_email'           => $v->email,
             'o_webmaster_email'       => $v->email,
             'o_webmaster_email'       => $v->email,
             'o_forum_subscriptions'   => 1,
             'o_forum_subscriptions'   => 1,

+ 0 - 8
app/Models/Pages/Admin/Options.php

@@ -56,7 +56,6 @@ class Options extends Admin
                     'b_users_online'          => 'required|integer|in:0,1',
                     'b_users_online'          => 'required|integer|in:0,1',
                     'b_show_dot'              => 'required|integer|in:0,1',
                     'b_show_dot'              => 'required|integer|in:0,1',
                     'b_topic_views'           => 'required|integer|in:0,1',
                     'b_topic_views'           => 'required|integer|in:0,1',
-                    'o_search_all_forums'     => 'required|integer|in:0,1',
                     'o_additional_navlinks'   => 'string:trim|max:65000 bytes',
                     'o_additional_navlinks'   => 'string:trim|max:65000 bytes',
                     'i_feed_type'             => 'required|integer|in:0,1,2',
                     'i_feed_type'             => 'required|integer|in:0,1,2',
                     'i_feed_ttl'              => 'required|integer|in:0,5,15,30,60',
                     'i_feed_ttl'              => 'required|integer|in:0,5,15,30,60',
@@ -433,13 +432,6 @@ class Options extends Admin
                     'caption' => 'Topic views label',
                     'caption' => 'Topic views label',
                     'help'    => 'Topic views help',
                     'help'    => 'Topic views help',
                 ],
                 ],
-                'o_search_all_forums' => [ //????
-                    'type'    => 'radio',
-                    'value'   => $config->o_search_all_forums,
-                    'values'  => $yn,
-                    'caption' => 'Search all label',
-                    'help'    => 'Search all help',
-                ],
                 'o_additional_navlinks' => [
                 'o_additional_navlinks' => [
                     'type'    => 'textarea',
                     'type'    => 'textarea',
                     'value'   => $config->o_additional_navlinks,
                     'value'   => $config->o_additional_navlinks,

+ 1 - 0
app/Models/Pages/Admin/Update.php

@@ -532,6 +532,7 @@ class Update extends Admin
         unset($config->o_users_online);
         unset($config->o_users_online);
         unset($config->o_censoring);
         unset($config->o_censoring);
         unset($config->o_quickjump);
         unset($config->o_quickjump);
+        unset($config->o_search_all_forums);
 
 
         $config->save();
         $config->save();
 
 

+ 0 - 6
app/lang/en/admin_options.po

@@ -150,12 +150,6 @@ msgstr "Topic views"
 msgid "Topic views help"
 msgid "Topic views help"
 msgstr "Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum."
 msgstr "Keep track of the number of views a topic has. Disable if you are experiencing high server load in a busy forum."
 
 
-msgid "Search all label"
-msgstr "Search all forums"
-
-msgid "Search all help"
-msgstr "When disabled, searches will only be allowed in one forum at a time. Disable if server load is high due to excessive searching."
-
 msgid "Menu items label"
 msgid "Menu items label"
 msgstr "Additional menu items"
 msgstr "Additional menu items"
 
 

+ 0 - 6
app/lang/ru/admin_options.po

@@ -150,12 +150,6 @@ msgstr "Счетчик просмотров"
 msgid "Topic views help"
 msgid "Topic views help"
 msgstr "Отслеживать сколько раз тема просматривалась. Выключите, если хотите снизить загрузку сервера."
 msgstr "Отслеживать сколько раз тема просматривалась. Выключите, если хотите снизить загрузку сервера."
 
 
-msgid "Search all label"
-msgstr "Поиск по всем разделам"
-
-msgid "Search all help"
-msgstr "Если выключено, поиск будет разрешен только по одному разделу за раз. Выключите в случае если поисковые запросы ведут к высокой загрузке сервера."
-
 msgid "Menu items label"
 msgid "Menu items label"
 msgstr "Дополнительные пункты меню"
 msgstr "Дополнительные пункты меню"