Browse Source

Change p_subject_all_caps

Visman 3 năm trước cách đây
mục cha
commit
0929a97be0

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

@@ -1256,7 +1256,7 @@ class Install extends Admin
             'i_feed_ttl'              => 0,
             'b_message_bbcode'        => 1,
             'b_message_all_caps'      => 0,
-            'p_subject_all_caps'      => 1,
+            'b_subject_all_caps'      => 0,
             'p_sig_all_caps'          => 1,
             'p_sig_bbcode'            => 1,
             'p_force_guest_email'     => 1,

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

@@ -85,7 +85,7 @@ class Options extends Admin
                     'b_announcement'          => 'required|integer|in:0,1|check_empty:o_announcement_message',
                     'o_announcement_message'  => 'string:trim|max:65000 bytes|html',
                     'b_message_all_caps'      => 'required|integer|in:0,1',
-                    'p_subject_all_caps'      => 'required|integer|in:0,1',
+                    'b_subject_all_caps'      => 'required|integer|in:0,1',
                     'p_force_guest_email'     => 'required|integer|in:0,1',
                     'p_sig_all_caps'          => 'required|integer|in:0,1',
                     'b_poll_enabled'          => 'required|integer|in:0,1',
@@ -377,9 +377,9 @@ class Options extends Admin
                     'caption' => 'All caps message label',
                     'help'    => 'All caps message help',
                 ],
-                'p_subject_all_caps' => [
+                'b_subject_all_caps' => [
                     'type'    => 'radio',
-                    'value'   => $config->p_subject_all_caps,
+                    'value'   => $config->b_subject_all_caps,
                     'values'  => $yn,
                     'caption' => 'All caps subject label',
                     'help'    => 'All caps subject help',

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

@@ -525,7 +525,9 @@ class Update extends Admin
         $config->b_default_dst         = '1' == $config->o_default_dst ? 1 : 0;
         $config->b_message_bbcode      = '1' == $config->p_message_bbcode ? 1 : 0;
         $config->b_message_all_caps    = '1' == $config->p_message_all_caps ? 1 : 0;
+        $config->b_subject_all_caps    = '1' == $config->p_subject_all_caps ? 1 : 0;
 
+        unset($config->p_subject_all_caps);
         unset($config->p_message_all_caps);
         unset($config->p_message_bbcode);
         unset($config->o_default_dst);

+ 1 - 1
app/Models/Pages/PostValidatorTrait.php

@@ -27,7 +27,7 @@ trait PostValidatorTrait
         // заголовок темы только заглавными буквами
         } elseif (
             ! $executive
-            && '0' == $this->c->config->p_subject_all_caps
+            && 1 != $this->c->config->b_subject_all_caps
             && \preg_match('%\p{Lu}%u', $subject)
             && ! \preg_match('%\p{Ll}%u', $subject)
         ) {