1.1 --- a/public_html/admin/story.php	Sat Oct 17 20:02:27 2009 +0200
     1.2 +++ b/public_html/admin/story.php	Sat Oct 17 23:00:40 2009 +0200
     1.3 @@ -288,7 +288,7 @@
     1.4                                  COM_getBlockTemplate ('_msg_block', 'header'));
     1.5          $display .= $LANG24[41];
     1.6          $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
     1.7 -        $display .= STORY_renderArticle ($A, 'p');
     1.8 +        $display .= STORY_renderArticle ($story, 'p');
     1.9          COM_accessLog("User {$_USER['username']} tried to illegally edit story $sid.");
    1.10          return $display;
    1.11      } elseif( $result == STORY_INVALID_SID ) {

     2.1 --- a/public_html/docs/history	Sat Oct 17 20:02:27 2009 +0200
     2.2 +++ b/public_html/docs/history	Sat Oct 17 23:00:40 2009 +0200
     2.3 @@ -3,6 +3,9 @@
     2.4  Oct ??, 2009 (1.6.1)
     2.5  ------------
     2.6  
     2.7 +- When a Story Admin did not have permission to edit a story, Geeklog threw a
     2.8 +  "call to a member function on a non-object" error when trying to display a
     2.9 +  proper "access denied" message (reported by Chase and Cesar) [Dirk]
    2.10  - Don't display the comment form for a story when comments aren't enabled for it
    2.11    (bug #0000994) [Dirk]
    2.12  - Fixed a long-standing quirk of the submission handling where the "Submissions"