Completed
Pull Request — master (#62)
by Morris
01:59
created
controller/appcontroller.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,8 +65,7 @@
 block discarded – undo
65 65
 						break;
66 66
 					}
67 67
 				}
68
-			}
69
-			else{
68
+			} else{
70 69
 				$firstPage = $order[0];
71 70
 			}
72 71
 		} 
Please login to merge, or discard this patch.
controller/settingscontroller.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,10 +55,14 @@  discard block
 block discarded – undo
55 55
 		// Private API call
56 56
 		$navigation = $this->navigationManager->getAll();
57 57
 		$order = json_decode($this->appConfig->getAppValue('order'));
58
-		if($order === null) $order = array();
58
+		if($order === null) {
59
+			$order = array();
60
+		}
59 61
 		$nav = $this->util->matchOrder($navigation, $order);
60 62
 		$hidden = json_decode($this->appConfig->getAppValue('hidden'));
61
-		if($hidden === null) $hidden = array();
63
+		if($hidden === null) {
64
+			$hidden = array();
65
+		}
62 66
 		return new TemplateResponse(
63 67
 			$this->appName,
64 68
 			'admin',
@@ -73,13 +77,17 @@  discard block
 block discarded – undo
73 77
 		$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
74 78
 		if($order === null){
75 79
 			$order = json_decode($this->appConfig->getAppValue('order'));
76
-			if($order === null) $order = array();
80
+			if($order === null) {
81
+				$order = array();
82
+			}
77 83
 		}
78 84
 		$nav = $this->util->matchOrder($navigation, $order);
79 85
 		$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
80 86
 		if($hidden === null){
81 87
 			$hidden = json_decode($this->appConfig->getAppValue('hidden'));
82
-			if($hidden === null) $hidden = array();
88
+			if($hidden === null) {
89
+				$hidden = array();
90
+			}
83 91
 		}
84 92
 		return new TemplateResponse(
85 93
 			$this->appName,
Please login to merge, or discard this patch.