Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev

zero-24 · zero-24 · commit c87266a2cfd2 · 2021-06-27T09:37:23.000+02:00
diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
@@ -714,7 +714,7 @@ public function isAdmin()
 				'deprecated'
 			);
 		}
-		catch (RuntimeException $exception)
+		catch (\RuntimeException $exception)
 		{
 			// Informational log only
 		}
@@ -740,7 +740,7 @@ public function isSite()
 				'deprecated'
 			);
 		}
-		catch (RuntimeException $exception)
+		catch (\RuntimeException $exception)
 		{
 			// Informational log only
 		}

Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ public function isAdmin()`
`714`	`714`	`'deprecated'`
`715`	`715`	`);`
`716`	`716`	`}`
`717`		`- catch (RuntimeException $exception)`
	`717`	`+ catch (\RuntimeException $exception)`
`718`	`718`	`{`
`719`	`719`	`// Informational log only`
`720`	`720`	`}`
`@@ -740,7 +740,7 @@ public function isSite()`
`740`	`740`	`'deprecated'`
`741`	`741`	`);`
`742`	`742`	`}`
`743`		`- catch (RuntimeException $exception)`
	`743`	`+ catch (\RuntimeException $exception)`
`744`	`744`	`{`
`745`	`745`	`// Informational log only`
`746`	`746`	`}`