Commit:    8c95f3e3317cca5629c682386ed2a79f4bef285d
Author:    Peter Cowburn <petercowb...@gmail.com>         Sat, 4 Jan 2014 
23:52:58 +0000
Parents:   1baa2265a6e1e7d7c43696dc361541382c0e085f
Branches:  master

Link:       
http://git.php.net/?p=web/wiki.git;a=commitdiff;h=8c95f3e3317cca5629c682386ed2a79f4bef285d

Log:
fix showing your vote

Changed paths:
  M  dokuwiki/lib/plugins/doodle/doodle_template.php
  M  systems/doodle-hide-votes-in-progress.diff


Diff:
diff --git a/dokuwiki/lib/plugins/doodle/doodle_template.php 
b/dokuwiki/lib/plugins/doodle/doodle_template.php
index 843a7cd..2f0dccf 100755
--- a/dokuwiki/lib/plugins/doodle/doodle_template.php
+++ b/dokuwiki/lib/plugins/doodle/doodle_template.php
@@ -40,8 +40,8 @@
 <?php foreach ($template['doodleData'] as $fullname => $userData) { ?>
     <tr>
         <td class="rightalign">
-          <?php $fullname = '<a href="//people.php.net/user.php?username=' . 
$fullname.'">' .$fullname. '</a>';?>
-          <?php echo $userData['editLinks'].$fullname.$userData['username'] ?>
+          <?php $people_link = '<a href="//people.php.net/user.php?username=' 
. $fullname.'">' .$fullname. '</a>';?>
+          <?php echo $userData['editLinks'].$people_link.$userData['username'] 
?>
         </td>
         <?php
         if ($is_closed || $INFO['userinfo']['name'] == $fullname) {
diff --git a/systems/doodle-hide-votes-in-progress.diff 
b/systems/doodle-hide-votes-in-progress.diff
index 9a6da8f..baf4ed2 100644
--- a/systems/doodle-hide-votes-in-progress.diff
+++ b/systems/doodle-hide-votes-in-progress.diff
@@ -1,5 +1,5 @@
 diff --git a/dokuwiki/lib/plugins/doodle/doodle_template.php 
b/dokuwiki/lib/plugins/doodle/doodle_template.php
-index 0dafba4..843a7cd 100755
+index 0dafba4..2f0dccf 100755
 --- a/dokuwiki/lib/plugins/doodle/doodle_template.php
 +++ b/dokuwiki/lib/plugins/doodle/doodle_template.php
 @@ -9,6 +9,7 @@
@@ -10,9 +10,14 @@ index 0dafba4..843a7cd 100755
    $c = count($template['choices']);
  ?>
  
-@@ -42,18 +43,30 @@
-           <?php $fullname = '<a href="//people.php.net/user.php?username=' . 
$fullname.'">' .$fullname. '</a>';?>
-           <?php echo $userData['editLinks'].$fullname.$userData['username'] ?>
+@@ -39,21 +40,33 @@
+ <?php foreach ($template['doodleData'] as $fullname => $userData) { ?>
+     <tr>
+         <td class="rightalign">
+-          <?php $fullname = '<a href="//people.php.net/user.php?username=' . 
$fullname.'">' .$fullname. '</a>';?>
+-          <?php echo $userData['editLinks'].$fullname.$userData['username'] ?>
++          <?php $people_link = '<a href="//people.php.net/user.php?username=' 
. $fullname.'">' .$fullname. '</a>';?>
++          <?php echo 
$userData['editLinks'].$people_link.$userData['username'] ?>
          </td>
 -        <?php for ($col = 0; $col < $c; $col++) {
 -            echo $userData['choice'][$col];


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to