aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/questionnaire
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-11-29 23:17:58 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-11-29 23:17:58 +0100
commit5d783464538807ef68f34d83d963af9e93a7268b (patch)
tree11406cd46cf3ea44d2a5eeb0606c7481d5a3c96f /phpBB/includes/questionnaire
parentaa9aa28fa25677b6b1c1dc60d7c345c4786a14e0 (diff)
parentb2a252d2748be0f18901db5fc0294566af04a2dc (diff)
downloadforums-5d783464538807ef68f34d83d963af9e93a7268b.tar
forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.gz
forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.bz2
forums-5d783464538807ef68f34d83d963af9e93a7268b.tar.xz
forums-5d783464538807ef68f34d83d963af9e93a7268b.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
Diffstat (limited to 'phpBB/includes/questionnaire')
-rw-r--r--phpBB/includes/questionnaire/questionnaire.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index f0fb8c3c06..2d29fe978e 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -70,7 +70,7 @@ class phpbb_questionnaire_data_collector
/**
* Collect info into the data property.
*
- * @return void
+ * @return null
*/
function collect()
{