Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24658
Modified Files:
serendipity_functions.inc.php NEWS
serendipity_admin_entries.inc.php
Log Message:
Fixed leaking draft data. Thanks, Kristian.
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- serendipity_functions.inc.php 6 Feb 2004 22:36:59 -0000 1.198
+++ serendipity_functions.inc.php 8 Feb 2004 12:06:05 -0000 1.199
@@ -553,12 +553,14 @@
/**
* Fetches a specific entry
**/
-function serendipity_fetchEntry($key, $val, $full = true) {
+function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false') {
global $serendipity;
- if ($full === true) {
- $body = ', body, extended';
+ $drafts = '';
+ if ($fetchDrafts == 'false') {
+ $drafts = "AND isdraft = 'false'";
}
+
$querystring = "SELECT
*,
c.category_name,
@@ -573,6 +575,7 @@
WHERE
a.authorid = e.authorid
AND $key LIKE $val
+ $drafts
LIMIT 1";
return serendipity_db_query($querystring, true);
@@ -628,6 +631,7 @@
WHERE
a.authorid = e.authorid
AND MATCH (title,body,extended) AGAINST ('".addslashes($term)."')
+ AND isdraft = 'false'
ORDER BY
timestamp DESC";
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- NEWS 6 Feb 2004 21:56:21 -0000 1.61
+++ NEWS 8 Feb 2004 12:06:05 -0000 1.62
@@ -2,6 +2,7 @@
Version 0.5.1 ()
------------------------------------
+ * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
* Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
Version 0.5 (February 6th, 2004)
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_entries.inc.php 21 Jan 2004 15:09:32 -0000 1.15
+++ serendipity_admin_entries.inc.php 8 Feb 2004 12:06:05 -0000 1.16
@@ -229,7 +229,7 @@
break;
case 'edit':
- $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+ $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
default:
serendipity_printEntryForm(
'?',
|