Completed
Pull Request — master (#52)
by Jakub
06:47 queued 04:31
created
controller/admin_controller.php 2 patches
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.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -65,22 +65,22 @@  discard block
 block discarded – undo
65 65
 	protected $errors = array();
66 66
 
67 67
 	/**
68
-	* Constructor
69
-	*
70
-	* @param \phpbb\template\template				$template			Template object
71
-	* @param \phpbb\user							$user				User object
72
-	* @param \phpbb\request\request					$request			Request object
73
-	* @param \phpbb\ads\ad\manager					$manager			Advertisement manager object
74
-	* @param \phpbb\ads\location\manager			$location_manager	Template location manager object
75
-	* @param \phpbb\log\log							$log				The phpBB log system
76
-	* @param \phpbb\config\db_text					$config_text		Config text object
77
-	* @param \phpbb\config\config					$config				Config object
78
-	* @param \phpbb\files\upload					$files_upload		Files upload object
79
-	* @param \phpbb\filesystem\filesystem_interface	$filesystem			Filesystem object
80
-	* @param string                      			$root_path			phpBB root path
81
-	* @param string									$php_ext			PHP extension
82
-	* @param string									$ext_path			Path to this extension
83
-	*/
68
+	 * Constructor
69
+	 *
70
+	 * @param \phpbb\template\template				$template			Template object
71
+	 * @param \phpbb\user							$user				User object
72
+	 * @param \phpbb\request\request					$request			Request object
73
+	 * @param \phpbb\ads\ad\manager					$manager			Advertisement manager object
74
+	 * @param \phpbb\ads\location\manager			$location_manager	Template location manager object
75
+	 * @param \phpbb\log\log							$log				The phpBB log system
76
+	 * @param \phpbb\config\db_text					$config_text		Config text object
77
+	 * @param \phpbb\config\config					$config				Config object
78
+	 * @param \phpbb\files\upload					$files_upload		Files upload object
79
+	 * @param \phpbb\filesystem\filesystem_interface	$filesystem			Filesystem object
80
+	 * @param string                      			$root_path			phpBB root path
81
+	 * @param string									$php_ext			PHP extension
82
+	 * @param string									$ext_path			Path to this extension
83
+	 */
84 84
 	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, \phpbb\filesystem\filesystem_interface $filesystem, $root_path, $php_ext, $ext_path)
85 85
 	{
86 86
 		$this->template = $template;
@@ -548,11 +548,11 @@  discard block
 block discarded – undo
548 548
 	}
549 549
 
550 550
 	/**
551
-	* Get admin form data.
552
-	*
553
-	* @param	string	$form_name	The form name.
554
-	* @return	array	Form data
555
-	*/
551
+	 * Get admin form data.
552
+	 *
553
+	 * @param	string	$form_name	The form name.
554
+	 * @return	array	Form data
555
+	 */
556 556
 	protected function get_form_data($form_name)
557 557
 	{
558 558
 		$data = array(
Please login to merge, or discard this patch.