diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
| commit | c56db535b4f0c943777ab159c14729d724f5d232 (patch) | |
| tree | 56a63ae78f97a990d3ca1512c5333aebd467895a /phpBB/includes/extension/interface.php | |
| parent | 11aff559d4fcde5c2935aa6ebdfcfbe162d91f64 (diff) | |
| parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
| download | forums-c56db535b4f0c943777ab159c14729d724f5d232.tar forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.gz forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.bz2 forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.xz forums-c56db535b4f0c943777ab159c14729d724f5d232.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/includes/extension/interface.php')
| -rw-r--r-- | phpBB/includes/extension/interface.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/extension/interface.php b/phpBB/includes/extension/interface.php index 74ecb9b762..7b36a12bf6 100644 --- a/phpBB/includes/extension/interface.php +++ b/phpBB/includes/extension/interface.php @@ -45,7 +45,9 @@ interface phpbb_extension_interface * * @param mixed $old_state The return value of the previous call * of this method, or false on the first call - * @return null + * @return mixed Returns false after last step, otherwise + * temporary state which is passed as an + * argument to the next step */ public function disable_step($old_state); |