Show configuration form after saving

include/admin/configuration.inc.php

@@ -20,8 +20,7 @@ if (!serendipity_checkPermission('siteConfiguration') && !serendipity_checkPermi
 
 $data = array();
 
-switch ($_POST['installAction'] && serendipity_checkFormToken()) {
+if ($_POST['installAction'] == 'check' && serendipity_checkFormToken()) {
-    case 'check':
     $data['installAction'] = 'check';
     $oldConfig = $serendipity;
     $res = serendipity_updateConfiguration();
@@ -62,16 +61,10 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
             serendipity_buildPermalinks();
         }
     }
-
-        break;
-
-    default:
-        $from = &$serendipity;
-        $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
-        $data['config'] = serendipity_printConfigTemplate($t, $from, false, true);
-        break;
 }
 
+$data['config'] = serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $serendipity, false, true);
+
 if (!is_object($serendipity['smarty'])) {
     serendipity_smarty_init();
 }

templates/2k11/admin/configuration.inc.tpl

@@ -1,3 +1,4 @@
+<h2>{$CONST.CONFIGURATION}</h2>
 {if $installAction == 'check'}
     {if $diagnosticError}
             <h2>{$CONST.DIAGNOSTIC_ERROR}</h2>
@@ -17,7 +18,5 @@
         {/if}
         <span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.WRITTEN_N_SAVED}</span>
     {/if}
-{else}
-    <h2>{$CONST.CONFIGURATION}</h2>
-    {$config}
 {/if}
+{$config}