diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
| commit | 3da7921f08ecdda929466921ecc50698f1adf99e (patch) | |
| tree | 0e179e504399e874bfd785d0a95eec44b76d5952 /inc/plugin.php | |
| parent | 6cf2bbfa12b776cf47cb69ae40fb8862f715ad01 (diff) | |
| parent | cc4bb766fdac23358d7b586aa3830b9650eed7a8 (diff) | |
| download | rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.gz rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.bz2 | |
Merge branch 'master' into future
* master: (162 commits)
fixed revision JS for images
upgraded SimplePie to 1.3.1 FS#2708
removed obsolete browser plugin (migrate does it)
adjust spacing to match standard 1.4em grid
added comment on use of whitelist vs blacklist
Updated idfilter() function for IIS
use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
added 'home' class to first link in hierarchical breadcrumbs
reduced required max width to go into tablet mode
re-added linear gradients for firefox
added missing styling for disabled form elements (FS#2705)
fixed acronyms in italics (FS#2684)
improved print styles (includes fixes for FS#2645 and FS#2707)
basic styles improvements
Greek language update
Use list in acl help text, for more structure
Galician language update
touch the config on save, even if no changes were made
unwind the width narrowing commit
put some whitespace between form submit button and fieldset bottom border
...
Conflicts:
lib/plugins/config/admin.php
lib/plugins/config/settings/config.class.php
Diffstat (limited to 'inc/plugin.php')
| -rw-r--r-- | inc/plugin.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/plugin.php b/inc/plugin.php index 6ffc1ddcb..cd6bd5ac7 100644 --- a/inc/plugin.php +++ b/inc/plugin.php @@ -82,8 +82,8 @@ class DokuWiki_Plugin { * retrieve a language dependent file and pass to xhtml renderer for display * plugin equivalent of p_locale_xhtml() * - * @param $id id of language dependent wiki page - * @return string parsed contents of the wiki page in xhtml format + * @param string $id id of language dependent wiki page + * @return string parsed contents of the wiki page in xhtml format */ function locale_xhtml($id) { return p_cached_output($this->localFN($id)); @@ -193,12 +193,12 @@ class DokuWiki_Plugin { * * @author Esther Brunner <wikidesign@gmail.com> * - * @param $name name of plugin to load - * @param $msg message to display in case the plugin is not available + * @param string $name name of plugin to load + * @param bool $msg if a message should be displayed in case the plugin is not available * * @return object helper plugin object */ - function loadHelper($name, $msg){ + function loadHelper($name, $msg = true){ if (!plugin_isdisabled($name)){ $obj = plugin_load('helper',$name); }else{ |