Index: branches/5.2.x/core/kernel/application.php =================================================================== diff -u -N -r14945 -r14950 --- branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14945) +++ branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14950) @@ -1,6 +1,6 @@ isAdmin ? '' : '?next_template=' . urlencode($_SERVER['REQUEST_URI']); // get next_template from query string if needed + $maintenance_page = WRITEBALE_BASE . '/maintenance.html'; + $query_string = ''; // $this->isAdmin ? '' : '?next_template=' . urlencode($_SERVER['REQUEST_URI']); - if ( file_exists(FULL_PATH . $maintenance_page) ) { - header('Location: ' . BASE_PATH . $maintenance_page); - exit; - } + if ( file_exists(FULL_PATH . $maintenance_page) ) { + header('Location: ' . BASE_PATH . $maintenance_page . $query_string); + exit; + } } /** @@ -956,8 +956,9 @@ $maintenance_template = $this->isAdmin ? 'login' : $this->ConfigValue('SoftMaintenanceTemplate'); if ( $this->GetVar('t') != $maintenance_template ) { + $redirect_params = Array (); - if (!$this->isAdmin) { + if ( !$this->isAdmin ) { $redirect_params['next_template'] = urlencode($_SERVER['REQUEST_URI']); }