diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:44:10 +0200 |
| commit | 28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch) | |
| tree | f022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/includes/functions_module.php | |
| parent | f8046cc2533f9f87eb914564c4e0e1215b0f007f (diff) | |
| parent | 2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff) | |
| download | forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2 forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12557] Fix load active module description
[ticket/12557] Fix php file description
[ticket/12557] Fix post data description for notifications
[ticket/12557] Fix pass by reference doc blocks
[ticket/12557] Fix doc block in extension base class
[ticket/12557] Fix doc block in mimetype guesser
[ticket/12557] Fix var $preserve_cr description
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Template fixes
[ticket/12557] Search, cron and profilefields fixes
[ticket/12557] Notification fixes
[ticket/12557] Fix doc block errors found by Sami pt1
[ticket/12557] Fix doc block errors found by Sami
[ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index f17333edda..397e6401ff 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -541,7 +541,9 @@ class p_master * * This method loads a given module, passing it the relevant id and mode. * - * @param string $mode mode, as passed through to the module + * @param string|false $mode mode, as passed through to the module + * @param string|false $module_url If supplied, we use this module url + * @param bool $execute_module If true, at the end we execute the main method for the new instance */ function load_active($mode = false, $module_url = false, $execute_module = true) { |