diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-08-04 10:41:00 +0100 |
| commit | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (patch) | |
| tree | c813b1fe3590314fcb1f20a30811d5de92871583 /lib/plugins/acl | |
| parent | d637819dca760b20f6e53e5847a92d08d8d15b8c (diff) | |
| parent | 90d5fa676926189b265430239dca3b7ba668b30b (diff) | |
| download | rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.gz rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/admin.php | 2 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/nl/lang.php | 4 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/sv/lang.php | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 0d9cd742a..50377da81 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -724,7 +724,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { static $label = 0; //number labels $ret = ''; - if($ispage && $setperm > AUTH_EDIT) $perm = AUTH_EDIT; + if($ispage && $setperm > AUTH_EDIT) $setperm = AUTH_EDIT; foreach(array(AUTH_NONE,AUTH_READ,AUTH_EDIT,AUTH_CREATE,AUTH_UPLOAD,AUTH_DELETE) as $perm){ $label += 1; diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 567eb46dc..e3a95e779 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -1,8 +1,8 @@ <?php + /** - * dutch language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author François Kooman <fkooman.tuxed.net> * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl> * @author Riny Heijdendael <riny@heijdendael.nl> diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php index 388672fc0..f226542e6 100644 --- a/lib/plugins/acl/lang/sv/lang.php +++ b/lib/plugins/acl/lang/sv/lang.php @@ -1,11 +1,11 @@ <?php + /** - * swedish language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Per Foreby <per@foreby.se> * @author Nicklas Henriksson <nicklas[at]nihe.se> - * @author Håkan Sandell <hakan.sandell[at]mydata.se> + * @author Håkan Sandell <hakan.sandell@home.se> * @author Dennis Karlsson * @author Tormod Otter Johansson <tormod@latast.se> * @author emil@sys.nu @@ -14,7 +14,6 @@ * @author Emil Lind <emil@sys.nu> * @author Bogge Bogge <bogge@bogge.com> * @author Peter Åström <eaustreum@gmail.com> - * @author Håkan Sandell <hakan.sandell@home.se> * @author mikael@mallander.net * @author Smorkster Andersson smorkster@gmail.com */ |