diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 2426bf57cd..d526bf6ee7 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -39,7 +39,7 @@
 		</dl>
 	</div>
 	<script>
-        var statsData = {S_STATS_DATA};
+		var statsData = {{ S_STATS_DATA }};
 	</script>
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
@@ -54,11 +54,11 @@
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
 		<p class="submit-buttons">
-			<!-- BEGIN providers -->
-				<!-- BEGIN values -->
-					<input type="hidden" name="{providers.NAME}[{providers.values.KEY}]" value="{providers.values.VALUE}" />
-				<!-- END values -->
-			<!-- END providers -->
+			{% for providers in loops.providers %}
+				{% for values in providers.values %}
+					<input type="hidden" name="{{ providers.NAME }}[{{ values.KEY }}]" value="{{ values.VALUE }}" />
+				{% endfor %}
+			{% endfor %}
 			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
 	</fieldset>
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index 2bc95cf58f..ec2e6fea5d 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -124,7 +124,7 @@ class phpbb_questionnaire_php_data_provider
 			'zend.ze1_compatibility_mode'	=> (int) @ini_get('zend.ze1_compatibility_mode'),
 			'unicode.semantics'				=> (int) @ini_get('unicode.semantics'),
 			'zend_thread_safty'				=> (int) function_exists('zend_thread_id'),
-			'extensions'					=> implode(",", get_loaded_extensions()),
+			'extensions'					=> implode(',', get_loaded_extensions()),
 		);
 	}
 }