diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 20:22:05 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 20:22:05 +0100 |
| commit | 23a363f01514464eb2238ac09ec7723d03d57ecb (patch) | |
| tree | 42c7dcff8c5b0e506a25d08ee5583ed2a24e8602 /lib/plugins/popularity/admin.php | |
| parent | 25e48e54df60b3df6efa365daceb3a8966c8f427 (diff) | |
| parent | 75cf672f10a71f7dee6d50eb70b742689838bc36 (diff) | |
| download | rpg-23a363f01514464eb2238ac09ec7723d03d57ecb.tar.gz rpg-23a363f01514464eb2238ac09ec7723d03d57ecb.tar.bz2 | |
Merge branch 'master' into stable
* master: (413 commits)
release preparation
fixed strict violation in ACL plugin
Fix issues from teams:i18n:translation-check in localizations
ensure locale is set back to the original value
skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
unittests for auth_loadACL
translation update
allow charset for SSO to be configured FS#2148
Mailer: avoid overlong headers in content ids FS#2868
translation update
translation update
replace \s, \S with [ \t], [^ \t] in regexs used with acls
translation update
translation update
translation update
translation update
Fix handling of the legacy subscription action name
remove obsolete opera handling and session closing
remove no longer used ajax.php
fix proxy CONNECT where HTTP 1.1 answer is given
...
Diffstat (limited to 'lib/plugins/popularity/admin.php')
| -rw-r--r-- | lib/plugins/popularity/admin.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index deb8048f4..bd2d090e1 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -13,7 +13,6 @@ if(!defined('DOKU_INC')) die(); * need to inherit from this class */ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { - var $version; /** * @var helper_plugin_popularity @@ -23,9 +22,6 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { function admin_plugin_popularity(){ $this->helper = $this->loadHelper('popularity', false); - - $pluginInfo = $this->getInfo(); - $this->version = $pluginInfo['date']; } /** |