From: nohn <nohn>
Date: Sat, 30 Apr 2005 09:48:23 +0000 (+0000)
Subject: backporrting
X-Git-Tag: 0.8.1~24
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7bd833c94b025f48375cd7c89206c05311a54b2a;p=s9y.git

backporrting
---

diff --git a/index.php b/index.php
index 9b6c3a2..7aba637 100644
--- 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 e54f5a5..64b42eb 100644
--- 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>