diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-14 16:32:35 +0200 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-14 16:32:35 +0200 |
commit | f119fb202b56acf8966f17b1ae4525c678b34865 (patch) | |
tree | f435ead6edbc359dc0616434a6a1df15c1a86b3f | |
parent | a1f2b5a3ca0af3e89bd77a5c68fd24b02416e60a (diff) | |
download | rpg-f119fb202b56acf8966f17b1ae4525c678b34865.tar.gz rpg-f119fb202b56acf8966f17b1ae4525c678b34865.tar.bz2 |
get version popularity plugin direct from plugin info
-rw-r--r-- | lib/plugins/popularity/admin.php | 3 | ||||
-rw-r--r-- | lib/plugins/popularity/helper.php | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index f90f844e1..bd2d090e1 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -22,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->helper->setVersion($pluginInfo['date']); } /** diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php index 9220d6b6d..9b092f2be 100644 --- a/lib/plugins/popularity/helper.php +++ b/lib/plugins/popularity/helper.php @@ -29,8 +29,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { */ var $popularityLastSubmitFile; - var $version; - function helper_plugin_popularity(){ global $conf; @@ -70,15 +68,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { } /** - * Sets plugin version - * - * @param string $pluginversion - */ - public function setVersion($pluginversion) { - $this->version = $pluginversion; - } - - /** * Check if autosubmit is enabled * @return boolean TRUE if we should send data once a month, FALSE otherwise */ @@ -138,11 +127,12 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { $data = array(); $phptime = ini_get('max_execution_time'); @set_time_limit(0); + $pluginInfo = $this->getInfo(); // version $data['anon_id'] = md5(auth_cookiesalt()); $data['version'] = getVersion(); - $data['popversion'] = $this->version; + $data['popversion'] = $pluginInfo['date']; $data['language'] = $conf['lang']; $data['now'] = time(); $data['popauto'] = (int) $this->isAutoSubmitEnabled(); |