sorry fixing conflict marker

2007-10-18 05:51:39 +00:00
parent fb38e114e7
commit 650044d9a2
1 changed files with 1 additions and 3 deletions
@@ -377,15 +377,13 @@

            if ($confirm and data_submitted() and confirm_sesskey()) {
                reset_role_capabilities($roleid);
-<<<<<<< manage.php

                // reset a role sitewide...
                mark_context_dirty($sitecontext->path);

-=======
                $rolename = get_field('role', 'name', 'id', $roleid);
                add_to_log(SITEID, 'role', 'reset', 'admin/roles/manage.php?roleid='.$roleid.'&action=reset', $rolename, '', $USER->id);
->>>>>>> 1.42.2.9
+
                redirect('manage.php?action=view&amp;roleid='.$roleid);

            } else {