Przeglądaj źródła

Change o_announcement

Visman 3 lat temu
rodzic
commit
c688ce1ac8

+ 1 - 1
app/Models/Page.php

@@ -71,7 +71,7 @@ abstract class Page extends Model
         $this->fTitle       = $container->config->o_board_title;
         $this->fDescription = $container->config->o_board_desc;
         $this->fRootLink    = $container->Router->link('Index');
-        if ('1' == $container->config->o_announcement) {
+        if (1 == $container->config->b_announcement) {
             $this->fAnnounce = $container->config->o_announcement_message;
         }
         $this->user         = $this->c->user; // передача текущего юзера в шаблон

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

@@ -1245,7 +1245,7 @@ class Install extends Admin
             'b_smtp_ssl'              => 0,
             'b_regs_allow'            => 1,
             'b_regs_verify'           => 1,
-            'o_announcement'          => 0,
+            'b_announcement'          => 0,
             'o_announcement_message'  => __('Announcement '),
             'o_rules'                 => 0,
             'o_rules_message'         => __('Rules '),

+ 3 - 3
app/Models/Pages/Admin/Options.php

@@ -82,7 +82,7 @@ class Options extends Admin
                     'o_rules'                 => 'required|integer|in:0,1|check_empty:o_rules_message',
                     'o_rules_message'         => 'string:trim|max:65000 bytes|html',
                     'i_default_email_setting' => 'required|integer|in:0,1,2',
-                    'o_announcement'          => 'required|integer|in:0,1|check_empty:o_announcement_message',
+                    'b_announcement'          => 'required|integer|in:0,1|check_empty:o_announcement_message',
                     'o_announcement_message'  => 'string:trim|max:65000 bytes|html',
                     'p_message_all_caps'      => 'required|integer|in:0,1',
                     'p_subject_all_caps'      => 'required|integer|in:0,1',
@@ -675,9 +675,9 @@ class Options extends Admin
         $form['sets']['announcement'] = [
             'legend' => 'Announcement subhead',
             'fields' => [
-                'o_announcement' => [
+                'b_announcement' => [
                     'type'    => 'radio',
-                    'value'   => $config->o_announcement,
+                    'value'   => $config->b_announcement,
                     'values'  => $yn,
                     'caption' => 'Display announcement label',
                     'help'    => 'Display announcement help',

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

@@ -519,7 +519,9 @@ class Update extends Admin
         $config->b_topic_subscriptions = '1' == $config->o_topic_subscriptions ? 1 : 0;
         $config->b_smtp_ssl            = '1' == $config->o_smtp_ssl ? 1 : 0;
         $config->b_regs_allow          = '1' == $config->o_regs_allow ? 1 : 0;
+        $config->b_announcement        = '1' == $config->o_announcement ? 1 : 0;
 
+        unset($config->o_announcement);
         unset($config->o_regs_allow);
         unset($config->o_smtp_ssl);
         unset($config->o_topic_subscriptions);