Completed
Pull Request — master (#421)
by Michael
1349:23 queued 1346:09
created
code/control/DNRoot.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
 	 * @param array $data
964 964
 	 * @param Form $form
965 965
 	 *
966
-	 * @return bool|HTMLText|SS_HTTPResponse
966
+	 * @return SS_HTTPResponse|null
967 967
 	 */
968 968
 	public function doCreateEnvironment($data, Form $form) {
969 969
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
@@ -2351,7 +2351,7 @@  discard block
 block discarded – undo
2351 2351
 	/**
2352 2352
 	 * Create project action.
2353 2353
 	 *
2354
-	 * @return SS_HTTPResponse
2354
+	 * @return HTMLText
2355 2355
 	 */
2356 2356
 	public function createproject(SS_HTTPRequest $request) {
2357 2357
 		if($this->canCreateProjects()) {
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -936,7 +936,9 @@  discard block
 block discarded – undo
936 936
 		}
937 937
 
938 938
 		$fields = $backend->getCreateEnvironmentFields($project);
939
-		if(!$fields) return null;
939
+		if(!$fields) {
940
+			return null;
941
+		}
940 942
 
941 943
 		if(!$project->canCreateEnvironments()) {
942 944
 			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
@@ -2366,8 +2368,12 @@  discard block
 block discarded – undo
2366 2368
 	 * @return bool
2367 2369
 	 */
2368 2370
 	public function canCreateProjects($member = null) {
2369
-		if(!$member) $member = Member::currentUser();
2370
-		if(!$member) return false;
2371
+		if(!$member) {
2372
+			$member = Member::currentUser();
2373
+		}
2374
+		if(!$member) {
2375
+			return false;
2376
+		}
2371 2377
 
2372 2378
 		return singleton('DNProject')->canCreate($member);
2373 2379
 	}
Please login to merge, or discard this patch.