diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2015-05-28 17:11:42 +0100 |
| commit | 4b8290f563ad5ac84dd92fb8ca97ba5970c472b3 (patch) | |
| tree | 7dca7c98013775628c2b4d1596e0be41d8d4bda2 /lib/plugins/usermanager | |
| parent | 9a734b7aaba1445e06c1ccb95e59f54e01688d45 (diff) | |
| parent | 4286c64e98499b93056c09498c10709f8909befd (diff) | |
| download | rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.gz rpg-4b8290f563ad5ac84dd92fb8ca97ba5970c472b3.tar.bz2 | |
Merge branch 'master' into ioreplaceinfile
Diffstat (limited to 'lib/plugins/usermanager')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 2 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/ca/lang.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 9cb9b0c40..0d92e5cc1 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -36,7 +36,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { /** * Constructor */ - public function admin_plugin_usermanager(){ + public function __construct(){ /** @var DokuWiki_Auth_Plugin $auth */ global $auth; diff --git a/lib/plugins/usermanager/lang/ca/lang.php b/lib/plugins/usermanager/lang/ca/lang.php index 6debd73ca..4b07326ab 100644 --- a/lib/plugins/usermanager/lang/ca/lang.php +++ b/lib/plugins/usermanager/lang/ca/lang.php @@ -1,7 +1,8 @@ <?php + /** - * Catalan language file - * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Carles Bellver <carles.bellver@gmail.com> * @author carles.bellver@gmail.com * @author carles.bellver@cent.uji.es |