1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 05:09:05 +01:00

Merge pull request #3334 from yesszus/patch-1

Update forum_admin.php
This commit is contained in:
Cameron 2018-08-02 14:04:00 -07:00 committed by GitHub
commit 472fdd4f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions

View File

@ -184,8 +184,8 @@ if(!deftrue('OLD_FORUMADMIN'))
'postspage' => array('title' => FORLAN_57, 'type'=>'number', 'data' => 'int','help'=>FORLAN_58),
'threadspage' => array('title' => FORLAN_186, 'type'=>'number', 'data' => 'int','help'=>FORLAN_187),
'editor' => array('title' => 'Post editor', 'type' => 'dropdown', 'data' => 'str', 'readParms' => array(), 'writeParms' => array('optArray' => array(), 'defaultValue' => 'default'), 'help' => 'Which editor should be used to create/edit posts?'),
'quickreply' => array('title' => 'Quick replay editor', 'type' => 'dropdown', 'data' => 'str', 'readParms' => array(), 'writeParms' => array('optArray' => array(), 'defaultValue' => 'default'), 'help' => '')
'editor' => array('title' => FORLAN_220, 'type' => 'dropdown', 'data' => 'str', 'readParms' => array(), 'writeParms' => array('optArray' => array(), 'defaultValue' => 'default'), 'help' => FORLAN_221),
'quickreply' => array('title' => FORLAN_222, 'type' => 'dropdown', 'data' => 'str', 'readParms' => array(), 'writeParms' => array('optArray' => array(), 'defaultValue' => 'default'), 'help' => '')
);
public $forumParents = array();
@ -229,7 +229,7 @@ if(!deftrue('OLD_FORUMADMIN'))
$this->checkOrder();
$this->prefs['editor']['writeParms']['optArray']['default'] = 'System default'; //todo LAN
$this->prefs['editor']['writeParms']['optArray']['default'] = FORLAN_217;
$this->prefs['editor']['writeParms']['optArray']['bbcode'] = 'BBCode';
//@ global pref should override plugins due to security considerations and allowance of posting html.
@ -240,8 +240,8 @@ if(!deftrue('OLD_FORUMADMIN'))
}*/
$this->prefs['quickreply']['writeParms']['optArray'] = array(
'default' => 'Textarea', //todo LAN
'wysiwyg' => 'Rich Text Editor' //TODO LAN
'default' => FORLAN_218,
'wysiwyg' => FORLAN_219
);
if(e107::isInstalled('poll') == false)

View File

@ -231,5 +231,11 @@ define("FORLAN_213", "Post");
define("FORLAN_214", "Leave blank to auto-generate it from the title above.");
define("FORLAN_215", "Not installed!");
define("FORLAN_216", "(New Parent)");
define("FORLAN_217", "System default");
define("FORLAN_218", "Textarea");
define("FORLAN_219", "Rich Text Editor");
define("FORLAN_220", "Post editor");
define("FORLAN_221", "Which editor should be used to create/edit posts?");
define("FORLAN_222", "Quick reply editor");
?>