Merge branch '2.6.x' into 2.x

modxcms · Feb 9, 2018 · f7bd539 · f7bd539
2 parents b63c1cd + f872037
commit f7bd539
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 22 deletions.
diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -12,6 +12,12 @@ development release, and is only shown to give an idea of what's currently in th
 - Ignore spaces in allowedExtensions properties and relevant system settings to ensure the right file types show up [#13702]
 - Add list of recent manager log entries to the Resource Overview page [#13734]
 
+MODX Revolution 2.6.2-pl (to be released)
+====================================
+- Remove max width from the tree sidebar [#13637]
+- Select the correct media source when editing a static element [#13750]
+- Fix the setup language being reset to English in the last step [#13611]
+
 MODX Revolution 2.6.1-pl (December 15, 2017)
 ====================================
 - Increase efficiency of cache refresh on autopublish events [#13572]

diff --git a/manager/assets/modext/core/modx.layout.js b/manager/assets/modext/core/modx.layout.js
@@ -141,7 +141,6 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
             ,split: true
             ,width: 310
             ,minSize: 288
-            ,maxSize: 800
             ,autoScroll: true
             ,unstyled: true
             ,collapseMode: 'mini'

diff --git a/manager/assets/modext/modx.jsgrps-min.js b/manager/assets/modext/modx.jsgrps-min.js
diff --git a/manager/assets/modext/widgets/element/modx.panel.chunk.js b/manager/assets/modext/widgets/element/modx.panel.chunk.js
@@ -95,6 +95,7 @@ MODx.panel.Chunk = function(config) {
                         ,description: MODx.expandHelp ? '' : _('static_file_msg')
                         ,name: 'static_file'
                         // ,hideFiles: true
+                        ,source: config.record.source != null ? config.record.source : MODx.config.default_media_source
                         ,openTo: config.record.openTo || ''
                         ,id: 'modx-chunk-static-file'
                         ,triggerClass: 'x-form-code-trigger'

diff --git a/manager/assets/modext/widgets/element/modx.panel.plugin.js b/manager/assets/modext/widgets/element/modx.panel.plugin.js
@@ -97,6 +97,7 @@ MODx.panel.Plugin = function(config) {
                         ,description: MODx.expandHelp ? '' : _('static_file_msg')
                         ,name: 'static_file'
                         // ,hideFiles: true
+                        ,source: config.record.source != null ? config.record.source : MODx.config.default_media_source
                         ,openTo: config.record.openTo || ''
                         ,id: 'modx-plugin-static-file'
                         ,triggerClass: 'x-form-code-trigger'

diff --git a/manager/assets/modext/widgets/element/modx.panel.snippet.js b/manager/assets/modext/widgets/element/modx.panel.snippet.js
@@ -96,6 +96,7 @@ MODx.panel.Snippet = function(config) {
                         ,description: MODx.expandHelp ? '' : _('static_file_msg')
                         ,name: 'static_file'
                         // ,hideFiles: true
+                        ,source: config.record.source != null ? config.record.source : MODx.config.default_media_source
                         ,openTo: config.record.openTo || ''
                         ,id: 'modx-snippet-static-file'
                         ,triggerClass: 'x-form-code-trigger'

diff --git a/manager/assets/modext/widgets/element/modx.panel.template.js b/manager/assets/modext/widgets/element/modx.panel.template.js
@@ -92,29 +92,14 @@ MODx.panel.Template = function(config) {
                         ,forId: 'modx-template-description'
                         ,html: _('template_desc_description')
                         ,cls: 'desc-under'
-                    },{
-                        xtype: 'textfield'
-                        ,fieldLabel: _('template_icon')
-                        ,description: MODx.expandHelp ? '' : _('template_icon_description')
-                        ,name: 'icon'
-                        ,id: 'modx-template-icon'
-                        ,anchor: '100%'
-                        ,maxLength: 100
-                        ,enableKeyEvents: true
-                        ,allowBlank: true
-                        ,value: config.record.icon
-                    },{
-                        xtype: MODx.expandHelp ? 'label' : 'hidden'
-                        ,forId: 'modx-template-icon'
-                        ,html: _('template_icon_description')
-                        ,cls: 'desc-under'
                     },{
                         xtype: 'modx-combo-browser'
                         ,browserEl: 'modx-browser'
                         ,fieldLabel: _('static_file')
                         ,description: MODx.expandHelp ? '' : _('static_file_msg')
                         ,name: 'static_file'
                         // ,hideFiles: true
+                        ,source: config.record.source != null ? config.record.source : MODx.config.default_media_source
                         ,openTo: config.record.openTo || ''
                         ,id: 'modx-template-static-file'
                         ,triggerClass: 'x-form-code-trigger'
@@ -145,6 +130,22 @@ MODx.panel.Template = function(config) {
                     },{
                         html: MODx.onTempFormRender
                         ,border: false
+                    },{
+                        xtype: 'textfield'
+                        ,fieldLabel: _('template_icon')
+                        ,description: MODx.expandHelp ? '' : _('template_icon_description')
+                        ,name: 'icon'
+                        ,id: 'modx-template-icon'
+                        ,anchor: '100%'
+                        ,maxLength: 100
+                        ,enableKeyEvents: true
+                        ,allowBlank: true
+                        ,value: config.record.icon
+                    },{
+                        xtype: MODx.expandHelp ? 'label' : 'hidden'
+                        ,forId: 'modx-template-icon'
+                        ,html: _('template_icon_description')
+                        ,cls: 'desc-under'
                     }]
                 },{
                     columnWidth: .4

diff --git a/setup/controllers/complete.php b/setup/controllers/complete.php
@@ -5,6 +5,7 @@
  * @var modInstallRequest $this
  * @package setup
  */
+
 if (!empty($_POST['proceed'])) {
     $install->settings->store($_POST);
     $this->proceed('login');

diff --git a/setup/controllers/language.php b/setup/controllers/language.php
@@ -7,12 +7,16 @@
  */
 /* parse language selection */
 if (!empty($_POST['proceed'])) {
-    $language= 'en';
-    $cookiePath = preg_replace('#[/\\\\]$#', '', dirname(dirname($_SERVER['REQUEST_URI'])));
-    if (isset($_REQUEST['language']) && is_dir($cookiePath . '/' . $_REQUEST['language'])) {
-        $language= $_REQUEST['language'];
+    $language = 'en';
+
+    $langPath = preg_replace('#[/\\\\]$#', '', dirname(__DIR__) . '/lang/');
+    if (isset($_REQUEST['language']) && is_dir($langPath . '/' . $_REQUEST['language'])) {
+        $language = $_REQUEST['language'];
     }
+
+    $cookiePath = preg_replace('#[/\\\\]$#', '', dirname(dirname($_SERVER['REQUEST_URI'])));
     setcookie('modx_setup_language', $language, 0, $cookiePath . '/');
+
     unset($_POST['proceed']);
     $settings = $install->request->getConfig();
     $settings = array_merge($settings,$_POST);