From 1ac489e9a7871e0441422459ecb7fd4e1cc20dda Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 16 Oct 2008 09:02:10 +0000
Subject: [PATCH] Update poll

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@6305 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/WikiPoll.php | 46 ++++-------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/lib/plugin/WikiPoll.php b/lib/plugin/WikiPoll.php
index fec94425a..2719eaf2d 100644
--- a/lib/plugin/WikiPoll.php
+++ b/lib/plugin/WikiPoll.php
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
+ Copyright 2008 Marc-Etienne Vargenau, Alcatel-lucent
  
  This file is part of PhpWiki.
 
@@ -33,10 +34,10 @@ rcs_id('$Id$');
            question[4]="What wiki engine do you like most?"
              answer[4][1]="c2Wiki" answer[4][2]="MoinMoin" answer[4][3]="PhpWiki"
              answer[4][4]="usemod" answer[4][5]="Twiki" answer[4][5]="guiki"
-             answer[4][6]="Other"
+             answer[4][6]="Mediawiki" answer[4][7]="Other"
            question[5]="Which PhpWiki version do you use?"
-             answer[5][1]="1.2.x" answer[5][2]="1.3. 1-2" answer[5][3]="1.3.3-4"
-             answer[5][4]="1.3.5-8"
+             answer[5][1]="1.2.x" answer[5][2]="1.3.1-12" answer[5][3]="1.3.13"
+             answer[5][4]="1.3.14"
 ?>
  *
  * Administration:
@@ -329,45 +330,6 @@ extends WikiPlugin
 
 };
 
-// $Log: not supported by cvs2svn $
-// Revision 1.9  2004/06/16 10:38:59  rurban
-// Disallow refernces in calls if the declaration is a reference
-// ("allow_call_time_pass_reference clean").
-//   PhpWiki is now allow_call_time_pass_reference = Off clean,
-//   but several external libraries may not.
-//   In detail these libs look to be affected (not tested):
-//   * Pear_DB odbc
-//   * adodb oracle
-//
-// Revision 1.8  2004/06/14 11:31:39  rurban
-// renamed global $Theme to $WikiTheme (gforge nameclash)
-// inherit PageList default options from PageList
-//   default sortby=pagename
-// use options in PageList_Selectable (limit, sortby, ...)
-// added action revert, with button at action=diff
-// added option regex to WikiAdminSearchReplace
-//
-// Revision 1.7  2004/05/01 15:59:29  rurban
-// more php-4.0.6 compatibility: superglobals
-//
-// Revision 1.6  2004/03/01 18:08:53  rurban
-// oops, checked in the debug version. revert to IP check on
-//
-// Revision 1.5  2004/03/01 16:11:13  rurban
-// graphical enhancement
-//
-// Revision 1.4  2004/02/26 01:42:27  rurban
-// don't cache this at all
-//
-// Revision 1.3  2004/02/24 03:54:46  rurban
-// lock page, more questions, new require_least arg
-//
-// Revision 1.2  2004/02/24 03:21:46  rurban
-// enabled require_all check in WikiPoll
-// better handling of <20 min visiting client: display results so far
-//
-//
-
 // For emacs users
 // Local Variables:
 // mode: php
-- 
2.45.0