2018-01-08 tpl

app/Models/CensorshipList/Load.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace ForkBB\Models\CensorshipList;
-
-use ForkBB\Models\Method;
-
-class Load extends Method
-{
-    /**
-     * Заполняет модель данными из БД
-     * Создает кеш
-     *
-     * @return CensorshipList
-     */
-    public function load()
-    {
-
-        $stmt = $this->c->DB->query('SELECT search_for, replace_with FROM ::censoring');
-        $search  = [];
-        $replace = [];
-        while ($row = $stmt->fetch()) {
-            $replace[] = $row['replace_with'];
-            $search[]  = '%(?<![\p{L}\p{N}])('.str_replace('\*', '[\p{L}\p{N}]*?', preg_quote($row['search_for'], '%')).')(?![\p{L}\p{N}])%iu';
-        }
-        $this->model->searchList   = $search;
-        $this->model->replaceList  = $replace;
-        $this->c->Cache->set('censorship', [
-            'searchList'  => $search,
-            'replaceList' => $replace,
-        ]);
-        return $this->model;
-    }
-}

app/templates/layouts/form.tpl

@@ -14,7 +14,7 @@
       @endif
     @endforeach
   @elseif (isset($set['fields']))
-          <fieldset>
+          <fieldset @if (isset($set['id'])) id="{{ $set['id'] }}" @endif>
     @if (isset($set['legend']))
             <legend>{!! $set['legend'] !!}</legend>
     @endif

app/templates/topic.tpl

@@ -75,7 +75,7 @@
               </li>
   @endif
               <li class="f-usertitle"><span>{{ $post->user->title() }}</span></li>
-  @if ($post->showUserInfo && $post->user->num_posts)
+  @if ($post->showPostCount && $post->user->num_posts)
               <li class="f-postcount"><span>{!! __('%s post', $post->user->num_posts, num($post->user->num_posts)) !!}</span></li>
   @endif
             </ul>