diff options
| -rw-r--r-- | inc/plugincontroller.class.php | 20 | ||||
| -rw-r--r-- | lib/plugins/extension/lang/nl/lang.php | 6 |
2 files changed, 4 insertions, 22 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index 8d20f885d..61c8811ce 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -172,25 +172,7 @@ class Doku_Plugin_Controller { if ($plugin[0] == '.') continue; // skip hidden entries if (is_file(DOKU_PLUGIN.$plugin)) continue; // skip files, we're only interested in directories - if (substr($plugin,-9) == '.disabled') { - // the plugin was disabled by rc2009-01-26 - // disabling mechanism was changed back very soon again - // to keep everything simple we just skip the plugin completely - continue; - } elseif (file_exists(DOKU_PLUGIN.$plugin.'/disabled')) { - /** - * treat this as a default disabled plugin(over-rideable by the plugin manager) - * @deprecated 2011-09-10 (usage of disabled files) - */ - if (empty($this->plugin_cascade['local'][$plugin])) { - $all_plugins[$plugin] = 0; - } else { - $all_plugins[$plugin] = 1; - } - $this->plugin_cascade['default'][$plugin] = 0; - - } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) || - ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){ + if (array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0){ $all_plugins[$plugin] = 0; } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) { diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php index ead2d9e8f..4fe8359d8 100644 --- a/lib/plugins/extension/lang/nl/lang.php +++ b/lib/plugins/extension/lang/nl/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Rene <wllywlnt@yahoo.com> * @author Gerrit Uitslag <klapinklapin@gmail.com> * @author Johan Vervloet <johan.vervloet@gmail.com> @@ -39,7 +39,7 @@ $lang['search_for'] = 'Zoek Uitbreiding:'; $lang['search'] = 'Zoek'; $lang['extensionby'] = '<strong>%s</strong> by %s'; $lang['screenshot'] = 'Schermafdruk bij %s'; -$lang['popularity'] = 'Populariteit:%s%%'; +$lang['popularity'] = 'Populariteit: %s%%'; $lang['homepage_link'] = 'Documentatie'; $lang['bugs_features'] = 'Bugs'; $lang['tags'] = 'Tags:'; @@ -82,7 +82,7 @@ $lang['missing_dependency'] = '<strong>niet aanwezige of uitgeschakelde afhan $lang['security_issue'] = '<strong>Veiligheids kwestie:</strong> %s'; $lang['security_warning'] = '<strong>Veiligheids Waarschuwing</strong> %s'; $lang['update_available'] = '<strong>Update:</strong> Nieuwe versie %s is beschikbaar.'; -$lang['wrong_folder'] = '<strong>Plugin onjuist geïnstalleerd:</strong> Hernoem de plugin directory van "%s" naar"%s"'; +$lang['wrong_folder'] = '<strong>Plugin onjuist geïnstalleerd:</strong> Hernoem de plugin directory van "%s" naar "%s"'; $lang['url_change'] = '<strong>URL gewijzigd:</strong> Download URL is gewijzigd sinds de laatste download. Controleer of de nieuwe URL juist is voordat u de uitbreiding updatet. <br />Nieuw:%s<Br /> Vorig: %s'; $lang['error_badurl'] = 'URLs moeten beginnen met http of https'; $lang['error_dircreate'] = 'De tijdelijke map kon niet worden gemaakt om de download te ontvangen'; |