From 90a4b95b615f6baa8ceacb00c28312e915508db1 Mon Sep 17 00:00:00 2001 From: onli Date: Sat, 4 Apr 2015 17:32:21 +0200 Subject: [PATCH] Move showMediaToolbar to 1. personal settings, add docu (#281) --- docs/NEWS | 3 +++ include/tpl/config_personal.inc.php | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 2eb97800..2f2ae240 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -58,6 +58,9 @@ Version 2.1 () Version 2.0.2 () ------------------------------------------------------------------------ + * Restore the "Show toolbar within media selector popup?" option, + it was ignored before. + * Fix Issue #321, negative offset for LIMIT SQL statements when using stable archive sorting and plugins like history. diff --git a/include/tpl/config_personal.inc.php b/include/tpl/config_personal.inc.php index 4a80ad2b..8d86a17d 100644 --- a/include/tpl/config_personal.inc.php +++ b/include/tpl/config_personal.inc.php @@ -153,6 +153,14 @@ 'permission' => 'personalConfiguration', 'default' => '', 'flags' => array('config')), + + array('var' => 'showMediaToolbar', + 'title' => SHOW_MEDIA_TOOLBAR, + 'description' => '', + 'type' => 'bool', + 'default' => false, + 'permission' => 'personalConfiguration', + 'flags' => array('config')), )); $res['defaults'] = @@ -183,14 +191,6 @@ 'permission' => 'personalConfiguration', 'flags' => array('config')), - array('var' => 'showMediaToolbar', - 'title' => SHOW_MEDIA_TOOLBAR, - 'description' => '', - 'type' => 'bool', - 'default' => false, - 'permission' => 'personalConfiguration', - 'flags' => array('config')), - array('var' => 'use_autosave', 'title' => CONF_USE_AUTOSAVE, 'description' => CONF_USE_AUTOSAVE_DESC,