Browse Source

Replace ->censorSubject to ->name

Visman 4 years ago
parent
commit
766ca92286

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

@@ -99,7 +99,7 @@ class Reports extends Admin
                 $forum = $topic->parent;
                 $forum = $topic->parent;
                 $cur['fields']['post' . $report->id] = [
                 $cur['fields']['post' . $report->id] = [
                     'type'    => 'str',
                     'type'    => 'str',
-                    'value'   => __(['Post #%s ', $post->id, $post->link, $topic->censorSubject, $topic->link, $forum->forum_name, $forum->link]),
+                    'value'   => __(['Post #%s ', $post->id, $post->link, $topic->name, $topic->link, $forum->forum_name, $forum->link]),
                     'html'    => true,
                     'html'    => true,
                 ];
                 ];
             } else {
             } else {

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

@@ -106,7 +106,7 @@ class Delete extends Page
                 'info' => [
                 'info' => [
                     'info' => [
                     'info' => [
                         [
                         [
-                            'value'   => __(['Topic %s', $post->parent->censorSubject]),
+                            'value'   => __(['Topic %s', $post->parent->name]),
                         ],
                         ],
                         [
                         [
                             'value'   => __([$deleteTopic ? 'Topic by' : 'Reply by', $post->poster, \ForkBB\dt($post->posted)]),
                             'value'   => __([$deleteTopic ? 'Topic by' : 'Reply by', $post->poster, \ForkBB\dt($post->posted)]),

+ 3 - 3
app/Models/Pages/Moderate.php

@@ -247,7 +247,7 @@ class Moderate extends Page
                 'Topic',
                 'Topic',
                 [
                 [
                     'id'   => $this->curTopic->id,
                     'id'   => $this->curTopic->id,
-                    'name' => $this->curTopic->censorSubject,
+                    'name' => $this->curTopic->name,
                     'page' => $page,
                     'page' => $page,
                 ]
                 ]
             );
             );
@@ -549,7 +549,7 @@ class Moderate extends Page
         $headers = [];
         $headers = [];
         foreach ($objects as $object) {
         foreach ($objects as $object) {
             if ($object instanceof Topic) {
             if ($object instanceof Topic) {
-                $headers[] = __(['Topic «%s»', $object->censorSubject]);
+                $headers[] = __(['Topic «%s»', $object->name]);
             } else {
             } else {
                 $headers[] = __(['Post «%1$s by %2$s»', \ForkBB\dt($object->posted), $object->poster]);
                 $headers[] = __(['Post «%1$s by %2$s»', \ForkBB\dt($object->posted), $object->poster]);
             }
             }
@@ -566,7 +566,7 @@ class Moderate extends Page
 
 
         if ($this->firstTopic instanceof Topic) {
         if ($this->firstTopic instanceof Topic) {
             $form['sets']['info']['info'][] = [
             $form['sets']['info']['info'][] = [
-                'value' => __(['All posts will be posted in the «%s» topic', $this->firstTopic->censorSubject]),
+                'value' => __(['All posts will be posted in the «%s» topic', $this->firstTopic->name]),
             ];
             ];
         }
         }
 
 

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

@@ -171,7 +171,7 @@ class Report extends Page
             ),
             ),
             'reason'       => $report->message,
             'reason'       => $report->message,
             'forumId'      => $report->post->parent->parent->id,
             'forumId'      => $report->post->parent->parent->id,
-            'topicSubject' => $report->post->parent->censorSubject,
+            'topicSubject' => $report->post->parent->name,
         ];
         ];
 
 
         return $this->c->Mail
         return $this->c->Mail

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

@@ -135,7 +135,7 @@ class Topic extends Page
             'Topic',
             'Topic',
             [
             [
                 'id'   => $topic->id,
                 'id'   => $topic->id,
-                'name' => $topic->censorSubject,
+                'name' => $topic->name,
                 'page' => $topic->page
                 'page' => $topic->page
             ]
             ]
         );
         );

+ 2 - 2
app/Models/Topic/Model.php

@@ -96,7 +96,7 @@ class Model extends DataModel
             'Topic',
             'Topic',
             [
             [
                 'id'   => $this->moved_to ?: $this->id,
                 'id'   => $this->moved_to ?: $this->id,
-                'name' => $this->censorSubject,
+                'name' => $this->name,
             ]
             ]
         );
         );
     }
     }
@@ -307,7 +307,7 @@ class Model extends DataModel
                 'Topic',
                 'Topic',
                 [
                 [
                     'id'   => $this->id,
                     'id'   => $this->id,
-                    'name' => $this->censorSubject,
+                    'name' => $this->name,
                 ]
                 ]
             );
             );
         }
         }

+ 1 - 1
app/templates/topic_in_search.forkbb.php

@@ -63,7 +63,7 @@
             </ul>
             </ul>
             <ul class="f-post-search-info">
             <ul class="f-post-search-info">
               <li class="f-psi-forum">{!! __('Forum') !!}: <a href="{{ $post->parent->parent->link }}">{{ $post->parent->parent->forum_name }}</a></li>
               <li class="f-psi-forum">{!! __('Forum') !!}: <a href="{{ $post->parent->parent->link }}">{{ $post->parent->parent->forum_name }}</a></li>
-              <li class="f-psi-topic">{!! __('Topic') !!}: <a href="{{ $post->parent->link }}">{{ $post->parent->censorSubject }}</a></li>
+              <li class="f-psi-topic">{!! __('Topic') !!}: <a href="{{ $post->parent->link }}">{{ $post->parent->name }}</a></li>
               <li class="f-psi-reply">{!! __(['%s Reply', $post->parent->num_replies, num($post->parent->num_replies)]) !!}</li>
               <li class="f-psi-reply">{!! __(['%s Reply', $post->parent->num_replies, num($post->parent->num_replies)]) !!}</li>
         @if ($post->parent->showViews)
         @if ($post->parent->showViews)
               <li class="f-psi-view">{!! __(['%s View', $post->parent->num_views, num($post->parent->num_views)]) !!}</li>
               <li class="f-psi-view">{!! __(['%s View', $post->parent->num_views, num($post->parent->num_views)]) !!}</li>