From 1ac6f4a2d4ff7914ce9e588c90e2817391d70f6b Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Thu, 23 Nov 2006 11:27:07 +0000
Subject: [PATCH] Small bugfix for category sorting and HTTP-Auth

---
 docs/NEWS                         | 4 ++++
 include/functions_entries.inc.php | 3 ++-
 serendipity_config.inc.php        | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 774296c8..499bbff6 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,10 @@
 Version 1.1 ()
 ------------------------------------------------------------------------
 
+    * Small bugfixes: Allow to use different login credentials than the
+      current HTTP Basic-Auth, if used. Order categories by name in
+      single entry view (garvinhicking)
+
     * Added bookmarklet to Serendipity core, added to the "Further links"
       welcome screen. Thanks to stm999999999! (garvinhicking)
 
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 9477bdc7..ec0845e1 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -132,7 +132,8 @@ function &serendipity_fetchEntryCategories($entryid) {
                     FROM {$serendipity['dbPrefix']}category AS c
               INNER JOIN {$serendipity['dbPrefix']}entrycat AS ec
                       ON ec.categoryid = c.categoryid
-                   WHERE ec.entryid = {$entryid}";
+                   WHERE ec.entryid = {$entryid}
+                ORDER BY c.category_name ASC";
 
         $cat =& serendipity_db_query($query);
         if (!is_array($cat)) {
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 6295c989..40489d88 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -268,8 +268,12 @@ if (IS_installed === true) {
             header("HTTP/1.0 401 Unauthorized");
             exit;
         } else {
-            $serendipity['POST']['user'] = $_SERVER['PHP_AUTH_USER'];
-            $serendipity['POST']['pass'] = $_SERVER['PHP_AUTH_PW'];
+            if (!isset($serendipity['POST']['user'])) {
+                $serendipity['POST']['user'] = $_SERVER['PHP_AUTH_USER'];
+            }
+            if (!isset($serendipity['POST']['pass'])) {
+                $serendipity['POST']['pass'] = $_SERVER['PHP_AUTH_PW'];
+            }
         }
     } elseif (isset($_REQUEST['http_auth_user']) && isset($_REQUEST['http_auth_pw'])) {
         $serendipity['POST']['user'] = $_REQUEST['http_auth_user'];