diff options
| author | Anika Henke <anika@selfthinker.org> | 2011-09-10 20:11:29 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2011-09-10 20:23:40 +0100 |
| commit | 29d511bfa507384ae0872f75fb54acb44b1e915e (patch) | |
| tree | bd9b3138f288fbc6786f3b28c7f3d438bf79c36f /lib/plugins/acl | |
| parent | 28b19f13203b5263ad89854a9c1df221975e4c38 (diff) | |
| parent | a95a7bf3a77d3c38a54af67b2f7584c480381691 (diff) | |
| download | rpg-29d511bfa507384ae0872f75fb54acb44b1e915e.tar.gz rpg-29d511bfa507384ae0872f75fb54acb44b1e915e.tar.bz2 | |
Merge branch 'plugincontroller' of git://github.com/piyushmishra/dokuwiki into plugincontroller
This adds support for the config_cascade when enabling/disabling plugins,
making farming easier.
The changes have been implemented by Piyush Mishra and are a part of the
new extension manager which will follow later. It's the result of a
Google Summer of Code project, the official project page can be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/piyushmishra/26001
Thanks to Piyush for the work and Google for sponsoring it!
Conflicts:
inc/lang/en/lang.php
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/admin.php | 14 | ||||
| -rw-r--r-- | lib/plugins/acl/plugin.info.txt | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 53f6db0cc..a6b0624bc 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -31,20 +31,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { var $specials = array(); /** - * return some info - */ - function getInfo(){ - return array( - 'author' => 'Andreas Gohr', - 'email' => 'andi@splitbrain.org', - 'date' => '2011-04-16', - 'name' => 'ACL Manager', - 'desc' => 'Manage Page Access Control Lists', - 'url' => 'http://dokuwiki.org/plugin:acl', - ); - } - - /** * return prompt for admin menu */ function getMenuText($language) { diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt new file mode 100644 index 000000000..f108a2390 --- /dev/null +++ b/lib/plugins/acl/plugin.info.txt @@ -0,0 +1,6 @@ +author Andreas Gohr +email andi@splitbrain.org +date 2011-04-16 +name ACL Manager +desc Manage Page Access Control Lists +url http://dokuwiki.org/plugin:acl |