Merge branch '1.4.x' of github.com:evolution-cms/evolution into 1.4.x

Author: AgelxNash

manager/frames/1.php

@@ -349,13 +349,6 @@
                                         <?= $_style['page_logout'] ?><?= $_lang['logout'] ?>
                                     </a>
                                 </li>
-                                <?php
-                                $style = $modx->config['settings_version'] != $modx->getVersionData('version') ? 'style="color:#ffff8a;"' : '';
-                                $version = 'Evolution';
-                                ?>
-                                <?php
-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
-                                ?>
                             </ul>
                         </li>
                         <?php if ($modx->hasPermission('settings') || $modx->hasPermission('view_eventlog') || $modx->hasPermission('logs') || $modx->hasPermission('help')) { ?>
@@ -402,6 +395,13 @@
                                             </a>
                                         </li>
                                     <?php } ?>
+                                    <?php
+                                    $style = $modx->config['settings_version'] != $modx->getVersionData('version') ? 'style="color:#ffff8a;"' : '';
+                                    $version = 'Evolution';
+                                    ?>
+                                    <?php
+                                    echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
+                                    ?>
                                 </ul>
                             </li>
                         <?php } ?>

manager/includes/document.parser.class.inc.php

@@ -6772,7 +6772,7 @@ public function applyFilter($value = '', $modifiers = false, $key = '')
      */
     private static function _getCleanQueryString()
     {
-        $q = MODX_CLI ? null : $_GET['q'];
+        $q = MODX_CLI ? null : (isset($_GET['q']) ? $_GET['q'] : '');
 
         //Return null if the query doesn't exist
         if (empty($q)) {