Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php

Prevent some E_NOTICE
2016-03-01 15:50:20 +01:00
parent be3fa8f8b1 04eacb6470
commit 04ccd9a776
2 changed files with 14 additions and 3 deletions
@@ -1047,11 +1047,21 @@ class App {
 	function save_timestamp($stamp, $value) {
 		$duration = (float)(microtime(true)-$stamp);

+		if (!isset($this->performance[$value])) {
+			// Prevent ugly E_NOTICE
+			$this->performance[$value] = 0;
+		}
+
 		$this->performance[$value] += (float)$duration;
 		$this->performance["marktime"] += (float)$duration;

 		$callstack = $this->callstack();

+		if (!isset($this->callstack[$value][$callstack])) {
+			// Prevent ugly E_NOTICE
+			$this->callstack[$value][$callstack] = 0;
+		}
+
 		$this->callstack[$value][$callstack] += (float)$duration;

 	}