com web/wiki: updated to 2014-09-29d "Hrun": dokuwiki/VERSION dokuwiki/doku.php dokuwiki/lib/plugins/usermanager/admin.php

Commit:    f7eba77e1a145bf830e114daebe12c89d8482ec0
Author:    Christoph M. Becker <[email protected]>         Sat, 21 Mar 2015 01:05:39 +0100
Parents:   24821c79fc82b394f1a87ff17636af07adaa1b6a
Branches:  master

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

Log:
updated to 2014-09-29d "Hrun"

Changed paths:
  M  dokuwiki/VERSION
  M  dokuwiki/doku.php
  M  dokuwiki/lib/plugins/usermanager/admin.php


Diff:
diff --git a/dokuwiki/VERSION b/dokuwiki/VERSION
index 6b338d4..0a86ba4 100644
--- a/dokuwiki/VERSION
+++ b/dokuwiki/VERSION
@@ -1 +1 @@
-2014-09-29c "Hrun"
+2014-09-29d "Hrun"
diff --git a/dokuwiki/doku.php b/dokuwiki/doku.php
index 16f48fc..13e3353 100644
--- a/dokuwiki/doku.php
+++ b/dokuwiki/doku.php
@@ -9,7 +9,7 @@
  */
 
 // update message version
-$updateVersion = 46.3;
+$updateVersion = 46.4;
 
 //  xdebug_start_profiling();
 
diff --git a/dokuwiki/lib/plugins/usermanager/admin.php b/dokuwiki/lib/plugins/usermanager/admin.php
index b67d91b..d777b65 100644
--- a/dokuwiki/lib/plugins/usermanager/admin.php
+++ b/dokuwiki/lib/plugins/usermanager/admin.php
@@ -191,9 +191,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
                  */
                 $groups = join(', ',$grps);
                 ptln("    <tr class=\"user_info\">");
-                ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".$user."]\" ".$delete_disable." /></td>");
+                ptln("      <td class=\"centeralign\"><input type=\"checkbox\" name=\"delete[".hsc($user)."]\" ".$delete_disable." /></td>");
                 if ($editable) {
-                    ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.hsc($user).']' => 1,
+                    ptln("    <td><a href=\"".wl($ID,array('fn[edit]['.$user.']' => 1,
                                                            'do' => 'admin',
                                                            'page' => 'usermanager',
                                                            'sectok' => getSecurityToken())).
@@ -325,7 +325,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
 
         // save current $user, we need this to access details if the name is changed
         if ($user)
-          ptln("          <input type=\"hidden\" name=\"userid_old\"  value=\"".$user."\" />",$indent);
+          ptln("          <input type=\"hidden\" name=\"userid_old\"  value=\"".hsc($user)."\" />",$indent);
 
         $this->_htmlFilterSettings($indent+10);
 
@@ -370,6 +370,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
             $fieldtype = 'text';
             $autocomp  = '';
         }
+        $value = hsc($value);
 
         echo "<tr $class>";
         echo "<td><label for=\"$id\" >$label: </label></td>";