[geeklog-cvs] geeklog: Synced with 1.5.2 Polls fixes

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/ac8cef1d497d
changeset: 6662:ac8cef1d497d
user:      Dirk Haun <dirk at haun-online.de>
date:      Tue Jan 06 13:38:22 2009 +0100
description:
Synced with 1.5.2 Polls fixes

diffstat:

2 files changed, 12 insertions(+), 8 deletions(-)
public_html/admin/plugins/polls/index.php |   15 ++++++++-------
public_html/docs/theme.html               |    5 ++++-

diffs (69 lines):

diff -r 9173577ab5f3 -r ac8cef1d497d public_html/admin/plugins/polls/index.php
--- a/public_html/admin/plugins/polls/index.php	Tue Jan 06 11:14:07 2009 +0100
+++ b/public_html/admin/plugins/polls/index.php	Tue Jan 06 13:38:22 2009 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Polls Plugin 2.0                                                          |
+// | Polls Plugin 2.1                                                          |
 // +---------------------------------------------------------------------------+
 // | index.php                                                                 |
 // |                                                                           |
 // | Geeklog poll administration page                                          |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors:                         |
+// | Copyright (C) 2000-2009 by the following authors:                         |
 // |                                                                           |
 // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
 // |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
@@ -31,14 +31,12 @@
 // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
 // |                                                                           |
 // +---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.59 2008/06/10 17:26:50 dhaun Exp $
+
+require_once '../../../lib-common.php';
+require_once '../../auth.inc.php';
 
 // Set this to true if you want to log debug messages to error.log
 $_POLL_VERBOSE = false;
-
-require_once '../../../lib-common.php';
-require_once '../../auth.inc.php';
 
 $display = '';
 
@@ -559,6 +557,9 @@
     if (empty($pid) && !empty($old_pid)) {
         $pid = $old_pid;
     }
+    if (empty($old_pid) && (! empty($pid))) {
+        $old_pid = $pid;
+    }
     if (!empty($pid)) {
         $statuscode = 0;
         if (isset ($_POST['statuscode'])) {
diff -r 9173577ab5f3 -r ac8cef1d497d public_html/docs/theme.html
--- a/public_html/docs/theme.html	Tue Jan 06 11:14:07 2009 +0100
+++ b/public_html/docs/theme.html	Tue Jan 06 13:38:22 2009 +0100
@@ -221,7 +221,7 @@
 </ul>
 
 
-<h2><a name="changes">Theme changes in Geeklog 1.5.2</a></h2>
+<h2><a name="changes152">Theme changes in Geeklog 1.5.2</a></h2>
 
 <p>Note: Themes made for Geeklog 1.5.0 or 1.5.1 should work just fine with
 Geeklog 1.5.2. In this release, we only fixed a few problems in the themes
@@ -243,6 +243,9 @@
 <li>The <code>{site_admin_url}</code> was missing from the Configuration form
     action in <tt>admin/config/configuration.thtml</tt>. This may have caused
     problems making configuration changes on some setups.</li>
+<li>Added a hidden <code>old_pid</code> input field to the polls editor template
+    file, <tt>plugins/polls/templates/admin/polleditor.thtml</tt>, to fix
+    problems when changing a poll's ID.</li>
 </ul>
 
 <h3>Other changes</h3>