[geeklog-cvs] Geeklog-1.x/public_html/polls index.php,1.28,1.29

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/polls
In directory qs1489.pair.com:/tmp/cvs-serv85934/public_html/polls

Modified Files:
	index.php 
Log Message:
Ensure message display for all "after save" options


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/polls/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** index.php	23 May 2008 14:40:16 -0000	1.28
--- index.php	24 May 2008 09:04:59 -0000	1.29
***************
*** 139,142 ****
--- 139,146 ----
      $mode = COM_applyFilter ($_REQUEST['mode']);
  }
+ $msg = 0;
+ if (isset($_REQUEST['msg'])) {
+     $msg = COM_applyFilter($_REQUEST['msg'], true);
+ }
  
  if (isset($pid)) {
***************
*** 147,152 ****
  }
  if (empty($pid)) {
!     $display .= COM_siteHeader ('menu', $LANG_POLLS['pollstitle'])
!              . polllist ();
  } else if ((isset($_POST['aid']) && (count($_POST['aid']) == $nquestions)) && !isset ($_COOKIE['poll-'.$pid])) {
      setcookie ('poll-'.$pid, implode('-',$aid), time() + $_PO_CONF['pollcookietime'],
--- 151,159 ----
  }
  if (empty($pid)) {
!     $display .= COM_siteHeader ('menu', $LANG_POLLS['pollstitle']);
!     if ($msg > 0) {
!         $display .= COM_showMessage($msg, 'polls');
!     }
!     $display .= polllist ();
  } else if ((isset($_POST['aid']) && (count($_POST['aid']) == $nquestions)) && !isset ($_COOKIE['poll-'.$pid])) {
      setcookie ('poll-'.$pid, implode('-',$aid), time() + $_PO_CONF['pollcookietime'],
***************
*** 156,159 ****
--- 163,169 ----
  } else if (isset($pid)) {
      $display .= COM_siteHeader();
+     if ($msg > 0) {
+         $display .= COM_showMessage($msg, 'polls');
+     }
      if (isset($_POST['aid'])) {
          $display .= COM_startBlock (