mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Small bugfix for category sorting and HTTP-Auth

Browse Source
This commit is contained in:
Garvin Hicking 2006-11-23 11:27:07 +00:00
parent d96d9a4df0
commit 1ac6f4a2d4
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -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)

3
include/functions_entries.inc.php
View File

@ -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)) {

8
serendipity_config.inc.php
View File

@ -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'];