MDL-11553, bulk user actions selection buttons do not work as expected

diff --git a/admin/user/user_bulk_form.php b/admin/user/user_bulk_form.php
index 302013ad8c169cc80e1013425a496b44c3c72096..bb8d4e02c41e1148fa7a29265046ebc334a2511b 100644 (file)
--- a/admin/user/user_bulk_form.php
+++ b/admin/user/user_bulk_form.php
@@ -97,8 +97,8 @@ class user_bulk_form extends moodleform {
                 $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, $SESSION->bulk_ausers);
             }
         } else if(@$data->removesel) {
-            if(!empty($data->ausers)) {
-                $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, array_values($data->ausers));
+            if(!empty($data->susers)) {
+                $SESSION->bulk_susers = array_diff($SESSION->bulk_susers, array_values($data->susers));
             }
         } else if(@$data->deletesel) {
             if(!empty($data->susers)) {

diff --git a/lang/en_utf8/bulkusers.php b/lang/en_utf8/bulkusers.php
index d864a019de2128eae314d06e9387055f3d8a4d38..e77d74effb47842a6865faa785fba180af2e3973 100644 (file)
--- a/lang/en_utf8/bulkusers.php
+++ b/lang/en_utf8/bulkusers.php
@@ -3,7 +3,7 @@ $string['usersinlist'] = 'Users in list';
 $string['addall'] = 'Add all available users';
 $string['addsel'] = 'Add selected available users';
 $string['removeall'] = 'Remove all available users';
-$string['removesel'] = 'Remove selected available users';
+$string['removesel'] = 'Remove selected users';
 $string['deleteall'] = 'Clear all users';
 $string['deletesel'] = 'Clear selected users';
 $string['available'] = 'Available';

diff --git a/lang/en_utf8/help/bulkusers/selectedlist.html b/lang/en_utf8/help/bulkusers/selectedlist.html
index d1b540bebd7b7d55b112ba0da7b2e8c7adb3e8d6..d63f9fee8498a4f3f544deec7468703292ca78a1 100644 (file)
--- a/lang/en_utf8/help/bulkusers/selectedlist.html
+++ b/lang/en_utf8/help/bulkusers/selectedlist.html
@@ -3,7 +3,7 @@
 <ul>
 <li>Add selected available users - adds selected users from the Available list (on the left) to the Selected list (on the right).</li>
 <li>Add all available users - adds all users from the Available list (on the left) to the Selected list (on the right).</li>
-<li>Remove selected available users - removes selected users from the Available list (on the left) from the Selected list (on the right).</li>
+<li>Remove selected users - removes selected users from the Selected list (on the right).</li>
 <li>Remove all available users - removes all users from the Available list (on the left) from the Selected list (on the right).</li>
 <li>Clear selected users - removes selected users from the Selected list (on the right).</li>
 <li>Clear all users - removes all users from the Selected list (on the right).</li>