[geeklog-cvs] geeklog: When a Story Admin did not have permission to edit a st...

[geeklog-cvs at lists.geeklog.net]

changeset 7386:c0af5c30022f
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c0af5c30022f
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 23:00:40 2009 +0200
description:
When a Story Admin did not have permission to edit a story, Geeklog threw a "call to a member function on a non-object" error when trying to display a proper "access denied" message (reported by Chase and Cesar)

diffstat:

 public_html/admin/story.php |  2 +-
 public_html/docs/history    |  3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 12aa30c5bdb4 -r c0af5c30022f public_html/admin/story.php
--- a/public_html/admin/story.php	Sat Oct 17 20:02:27 2009 +0200
+++ b/public_html/admin/story.php	Sat Oct 17 23:00:40 2009 +0200
@@ -288,7 +288,7 @@
                                 COM_getBlockTemplate ('_msg_block', 'header'));
         $display .= $LANG24[41];
         $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
-        $display .= STORY_renderArticle ($A, 'p');
+        $display .= STORY_renderArticle ($story, 'p');
         COM_accessLog("User {$_USER['username']} tried to illegally edit story $sid.");
         return $display;
     } elseif( $result == STORY_INVALID_SID ) {
diff -r 12aa30c5bdb4 -r c0af5c30022f public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 20:02:27 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 23:00:40 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- When a Story Admin did not have permission to edit a story, Geeklog threw a
+  "call to a member function on a non-object" error when trying to display a
+  proper "access denied" message (reported by Chase and Cesar) [Dirk]
 - Don't display the comment form for a story when comments aren't enabled for it
   (bug #0000994) [Dirk]
 - Fixed a long-standing quirk of the submission handling where the "Submissions"