Completed
Pull Request — master (#52)
by Jakub
09:16
created
controller/admin_controller.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -62,21 +62,21 @@  discard block
 block discarded – undo
62 62
 	protected $errors = array();
63 63
 
64 64
 	/**
65
-	* Constructor
66
-	*
67
-	* @param \phpbb\template\template		$template			Template object
68
-	* @param \phpbb\user					$user				User object
69
-	* @param \phpbb\request\request			$request			Request object
70
-	* @param \phpbb\ads\ad\manager			$manager			Advertisement manager object
71
-	* @param \phpbb\ads\location\manager	$location_manager	Template location manager object
72
-	* @param \phpbb\log\log					$log				The phpBB log system
73
-	* @param \phpbb\config\db_text			$config_text		Config text object
74
-	* @param \phpbb\config\config			$config				Config object
75
-	* @param \phpbb\files\upload			$files_upload		Files upload object
76
-	* @param string                      	$root_path			phpBB root path
77
-	* @param string							$php_ext			PHP extension
78
-	* @param string							$ext_path			Path to this extension
79
-	*/
65
+	 * Constructor
66
+	 *
67
+	 * @param \phpbb\template\template		$template			Template object
68
+	 * @param \phpbb\user					$user				User object
69
+	 * @param \phpbb\request\request			$request			Request object
70
+	 * @param \phpbb\ads\ad\manager			$manager			Advertisement manager object
71
+	 * @param \phpbb\ads\location\manager	$location_manager	Template location manager object
72
+	 * @param \phpbb\log\log					$log				The phpBB log system
73
+	 * @param \phpbb\config\db_text			$config_text		Config text object
74
+	 * @param \phpbb\config\config			$config				Config object
75
+	 * @param \phpbb\files\upload			$files_upload		Files upload object
76
+	 * @param string                      	$root_path			phpBB root path
77
+	 * @param string							$php_ext			PHP extension
78
+	 * @param string							$ext_path			Path to this extension
79
+	 */
80 80
 	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\request\request $request, \phpbb\ads\ad\manager $manager, \phpbb\ads\location\manager $location_manager, \phpbb\log\log $log, \phpbb\config\db_text $config_text, \phpbb\config\config $config, \phpbb\files\upload $files_upload, $root_path, $php_ext, $ext_path)
81 81
 	{
82 82
 		$this->template = $template;
@@ -524,11 +524,11 @@  discard block
 block discarded – undo
524 524
 	}
525 525
 
526 526
 	/**
527
-	* Get admin form data.
528
-	*
529
-	* @param	string	$form_name	The form name.
530
-	* @return	array	Form data
531
-	*/
527
+	 * Get admin form data.
528
+	 *
529
+	 * @param	string	$form_name	The form name.
530
+	 * @return	array	Form data
531
+	 */
532 532
 	protected function get_form_data($form_name)
533 533
 	{
534 534
 		$data = array(
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -473,7 +473,7 @@
 block discarded – undo
473 473
 	 * Upload image and return updated ad code or <img> of new banner when using ajax.
474 474
 	 *
475 475
 	 * @param	 string	 $ad_code	 Current ad code
476
-	 * @return	 mixed	 \phpbb\json_response when request is ajax or updated ad code otherwise.
476
+	 * @return	 string	 \phpbb\json_response when request is ajax or updated ad code otherwise.
477 477
 	 */
478 478
 	protected function process_banner_upload($ad_code)
479 479
 	{
Please login to merge, or discard this patch.