backporrting

diff --git a/index.php b/index.php
index 9b6c3a250b9ee9feaf0cb6d4b778f5e6675b3365..7aba63722e9f3d543866b845efb31f42b4c2210c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -206,7 +206,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
     print $data;
     exit;
 } else if (preg_match(PAT_ADMIN, $uri)) {
-    header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
+    header("Location: {$serendipity['baseURL']}serendipity_admin.php");
     exit;
 } else if (preg_match(PAT_ARCHIVE, $uri)) {
     $serendipity['GET']['action'] = 'archives';

diff --git a/serendipity_admin.php b/serendipity_admin.php
index e54f5a52f162e9f916073501559a7da76a947fbc..64b42ebb5dfd25ac144dacf0f14ef41b53e12ff3 100644 (file)
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -114,7 +114,7 @@ if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2d
                                 <td><input type="password" name="serendipity[pass]" /></td>
                             </tr>
                             <tr>
-                                <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?>
+                                <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?></label></td>
                             </tr>
                             <tr>
                                 <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" class="serendipityPrettyButton" /></td>