Typo

adaur · adaur · commit 18a32b7f18df · 2017-02-14T20:51:59.000+01:00
diff --git a/featherbb/Controller/Admin/Parser.php b/featherbb/Controller/Admin/Parser.php
@@ -43,7 +43,7 @@ public function display($req, $res, $args)
                             if (preg_match('%^image/%', $f['type'])) {        // If we have an image file type?
                                 if ($f['size'] > 0 && $f['size'] <= ForumSettings::get('o_avatars_size')) {
                                     if (move_uploaded_file($f['tmp_name'], ForumEnv::get('FEATHER_ROOT') .'style/img/smilies/'. $name)) {
-                                        return Router::redirect(Router::pathFor('adminParser'), _e('upload success'));
+                                        return Router::redirect(Router::pathFor('adminParser'), __('upload success'));
                                     } else { //  Error #1: 'Smiley upload failed. Unable to move to smiley folder.'.
                                         throw new Error(__('upload_err_1'), 500);
                                     }
@@ -75,7 +75,7 @@ public function display($req, $res, $args)
                 $stext = Input::post('smiley_text');
                 $sfile = Input::post('smiley_file');
                 $len = count(Input::post('smiley_text'));
-                $smilies = array();
+                $smilies = [];
                 for ($i = 0; $i < $len; ++$i) { // Loop through all posted smileys.
                     if (isset($stext[$i]) && $stext[$i] != '' && $sfile !== 'select new file') {
                         echo $i.'<br>';
@@ -86,19 +86,19 @@ public function display($req, $res, $args)
                 Container::get('cache')->store('smilies', $smilies);
             }
 
-            return Router::redirect(Router::pathFor('adminParser'), _e('save_success'));
+            return Router::redirect(Router::pathFor('adminParser'), __('save_success'));
         }
 
         AdminUtils::generateAdminMenu('parser');
 
-        return View::setPageInfo(array(
-                'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')),
+        return View::setPageInfo([
+                'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Parser')],
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'smiley_files' => $this->model->getSmileyFiles(),
                 'smilies' =>    $smilies,
                 'urlBase' => URL::base().'/style/img/smilies/',
-            )
+            ]
         )->addTemplate('admin/parser.php')->display();
     }
 }
diff --git a/featherbb/Model/Admin/Parser.php b/featherbb/Model/Admin/Parser.php
@@ -18,15 +18,13 @@ public function getSmileyFiles()
     {
         $imgfiles = [];
         $filelist = scandir(ForumEnv::get('FEATHER_ROOT').'style/img/smilies');
-        var_dump($filelist);
         $filelist = Container::get('hooks')->fire('model.admin.parser.get_smiley_files.filelist', $filelist);
         foreach ($filelist as $file) {
             if (preg_match('/\.(?:png|gif|jpe?g)$/', $file)) {
                 $imgfiles[] = $file;
             }
         }
         $imgfiles = Container::get('hooks')->fire('model.admin.parser.get_smiley_files.imgfiles', $imgfiles);
-        var_dump($imgfiles);
         return $imgfiles;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,13 @@ public function getSmileyFiles()`
`18`	`18`	`{`
`19`	`19`	`$imgfiles = [];`
`20`	`20`	`$filelist = scandir(ForumEnv::get('FEATHER_ROOT').'style/img/smilies');`
`21`		`- var_dump($filelist);`
`22`	`21`	`$filelist = Container::get('hooks')->fire('model.admin.parser.get_smiley_files.filelist', $filelist);`
`23`	`22`	`foreach ($filelist as $file) {`
`24`	`23`	`if (preg_match('/\.(?:png\|gif\|jpe?g)$/', $file)) {`
`25`	`24`	`$imgfiles[] = $file;`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`$imgfiles = Container::get('hooks')->fire('model.admin.parser.get_smiley_files.imgfiles', $imgfiles);`
`29`		`- var_dump($imgfiles);`
`30`	`28`	`return $imgfiles;`
`31`	`29`	`}`
`32`	`30`	`}`