Completed
Pull Request — master (#160)
by Sander
04:07
created
migration/serversideencryption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
 		}
84 84
 	}
85 85
 
86
-	private function fetchAll($sql){
86
+	private function fetchAll($sql) {
87 87
 		return $this->db->executeQuery($sql)->fetchAll();
88 88
 	}
89 89
 
Please login to merge, or discard this patch.
controller/credentialcontroller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -167,13 +167,13 @@  discard block
 block discarded – undo
167 167
 				$activity . '_self', array($label, $this->userId, $revision_created),
168 168
 				'', array(),
169 169
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
170
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
170
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
171 171
 			$activity = 'item_deleted';
172 172
 			$this->activityService->add(
173 173
 				$activity . '_self', array($label, $this->userId),
174 174
 				'', array(),
175 175
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
176
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
176
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
177 177
 			$activity = 'item_recovered';
178 178
 			$this->activityService->add(
179 179
 				$activity . '_self', array($label, $this->userId),
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 			$credential['shared_key'] = '';
242 242
 		}
243 243
 
244
-		if(!isset($credential['shared_key'])){
244
+		if (!isset($credential['shared_key'])) {
245 245
 			$credential['shared_key'] = $storedCredential->getSharedKey();
246 246
 		}
247 247
 
Please login to merge, or discard this patch.