com web/wiki: Revert "fix showing your vote": dokuwiki/lib/plug ins/doodle/doodle_template.php systems/doodle-hide-votes- in-progress.diff

Commit: 288864265b11ecfdc244ee3fa250866b7b2cace9 Author: Hannes Magnusson <bjori@mongodb.com> Mon, 6 Jan 2014 17:23:50 -0800 Parents: 8c95f3e3317cca5629c682386ed2a79f4bef285d Branches: master Link: http://git.php.net/?p=web/wiki.git;a=commitdiff;h=288864265b11ecfdc244ee3fa250866b7b2cace9 Log: Revert "fix showing your vote" This reverts commit 8c95f3e3317cca5629c682386ed2a79f4bef285d. 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 2f0dccf..843a7cd 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 $people_link = '<a href="//people.php.net/user..php?username=' . $fullname.'">' .$fullname. '</a>';?> - <?php echo $userData['editLinks'].$people_link.$userData['username'] ?> + <?php $fullname = '<a href="//people.php.net/user.php?username=' . $fullname.'">' .$fullname. '</a>';?> + <?php echo $userData['editLinks'].$fullname.$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 baf4ed2..9a6da8f 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..2f0dccf 100755 +index 0dafba4..843a7cd 100755 --- a/dokuwiki/lib/plugins/doodle/doodle_template.php +++ b/dokuwiki/lib/plugins/doodle/doodle_template.php @@ -9,6 +9,7 @@ @@ -10,14 +10,9 @@ index 0dafba4..2f0dccf 100755 $c = count($template['choices']); ?> -@@ -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'] ?> +@@ -42,18 +43,30 @@ + <?php $fullname = '<a href="//people.php.net/user.php?username=' . $fullname.'">' .$fullname. '</a>';?> + <?php echo $userData['editLinks'].$fullname.$userData['username'] ?> </td> - <?php for ($col = 0; $col < $c; $col++) { - echo $userData['choice'][$col];