[geeklog-cvs] geeklog: Fixed a non-feature where canceling out of the story ed...

[geeklog-cvs at lists.geeklog.net]

changeset 7566:4da2af0dbb5d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/4da2af0dbb5d
user: Dirk Haun <dirk at haun-online.de>
date: Thu Dec 31 17:30:19 2009 +0100
description:
Fixed a non-feature where canceling out of the story editor would select that story's topic in the admin's list of stories

diffstat:

 public_html/admin/story.php |  33 ++++++++++++++++++++++-----------
 public_html/docs/history    |   2 ++
 2 files changed, 24 insertions(+), 11 deletions(-)

diffs (74 lines):

diff -r 1b1b57510fc9 -r 4da2af0dbb5d public_html/admin/story.php
--- a/public_html/admin/story.php	Thu Dec 31 15:26:05 2009 +0100
+++ b/public_html/admin/story.php	Thu Dec 31 17:30:19 2009 +0100
@@ -103,7 +103,14 @@
     return $retval;
 }
 
-function liststories()
+/**
+* Provide list of stories
+*
+* @param    string  $current_topic  (optional) currently selected topic
+* @return   string                  HTML for the list of stories
+*
+*/
+function liststories($current_topic = '')
 {
     global $_CONF, $_TABLES, $_IMAGE_TYPE,
            $LANG09, $LANG_ADMIN, $LANG_ACCESS, $LANG24;
@@ -112,11 +119,7 @@
 
     $retval = '';
 
-    if (!empty ($_GET['tid'])) {
-        $current_topic = COM_applyFilter($_GET['tid']);
-    } elseif (!empty ($_POST['tid'])) {
-        $current_topic = COM_applyFilter($_POST['tid']);
-    } else {
+    if (empty($current_topic)) {
         $current_topic = $LANG09[9];
     }
 
@@ -885,16 +888,24 @@
     submitstory ();
 } else { // 'cancel' or no mode at all
     $type = '';
-    if (isset($_POST['type'])){
-        $type = COM_applyFilter ($_POST['type']);
+    if (isset($_POST['type'])) {
+        $type = COM_applyFilter($_POST['type']);
     }
-    if (($mode == $LANG24[10]) && !empty ($LANG24[10]) &&
+    if (($mode == $LANG24[10]) && !empty($LANG24[10]) &&
             ($type == 'submission')) {
-        $display = COM_refresh ($_CONF['site_admin_url'] . '/moderation.php');
+        $display = COM_refresh($_CONF['site_admin_url'] . '/moderation.php');
     } else {
+        $current_topic = '';
+        if (empty($mode)) {
+            if (!empty ($_GET['tid'])) {
+                $current_topic = COM_applyFilter($_GET['tid']);
+            } elseif (!empty ($_POST['tid'])) {
+                $current_topic = COM_applyFilter($_POST['tid']);
+            }
+        }
         $display .= COM_siteHeader('menu', $LANG24[22]);
         $display .= COM_showMessageFromParameter();
-        $display .= liststories();
+        $display .= liststories($current_topic);
         $display .= COM_siteFooter();
     }
     COM_output($display);
diff -r 1b1b57510fc9 -r 4da2af0dbb5d public_html/docs/history
--- a/public_html/docs/history	Thu Dec 31 15:26:05 2009 +0100
+++ b/public_html/docs/history	Thu Dec 31 17:30:19 2009 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2010 (1.6.2)
 ------------
 
+- Fixed a non-feature where canceling out of the story editor would select that
+  story's topic in the admin's list of stories [Dirk]
 - Fixed problem uninstalling plugins - missing globals (bug #0001048)
 - Added an option to create a copy of a story (feature request #0000811) [Dirk]
 - Updated FCKeditor to version 2.6.5 [Dirk]