summaryrefslogtreecommitdiff
path: root/lib/plugins/acl
diff options
context:
space:
mode:
authorHakan Sandell <sandell.hakan@gmail.com>2010-11-20 14:30:57 +0100
committerHakan Sandell <sandell.hakan@gmail.com>2010-11-20 14:30:57 +0100
commit8f0a521756228d15469d2a712fa1010b64a1d53a (patch)
tree38ce28a99433403fa18d2bce871abc7290c8be54 /lib/plugins/acl
parentba9418bca378a6759305e3b388926df4f5a0af9c (diff)
parent85dcda20ffd82becbe69a7ca5d99e4b6fd99c9ea (diff)
downloadrpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.gz
rpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.bz2
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/acl')
-rw-r--r--lib/plugins/acl/admin.php2
-rw-r--r--lib/plugins/acl/lang/ko/lang.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 84932f7ac..3e7bd8121 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -765,7 +765,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
//build code
$ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
- $ret .= '<input '.html_attbuild($atts).' />&nbsp;';
+ $ret .= '<input '.buildAttributes($atts).' />&nbsp;';
$ret .= $this->getLang('acl_perm'.$perm);
$ret .= '</label>'.NL;
}
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 43a5ceeeb..6f4e991cb 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -10,6 +10,7 @@
* @author dongnak@gmail.com
* @author Song Younghwan <purluno@gmail.com>
* @author SONG Younghwan <purluno@gmail.com>
+ * @author Seung-Chul Yoo <dryoo@live.com>
*/
$lang['admin_acl'] = '접근 제어 목록 관리';
$lang['acl_group'] = '그룹';