D420.id1024.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D420.id1024.diff
View Options

	diff --git a/app/Assets/Stylesheet.php b/app/Assets/Stylesheet.php
	--- a/app/Assets/Stylesheet.php
	+++ b/app/Assets/Stylesheet.php
	@@ -38,7 +38,6 @@
	static private function print404 () {
	static::print404Headers();
	echo "/* 404 - Stylesheet not found. */";
	- exit;
	}

	///
	@@ -49,7 +48,7 @@
	$name = $_GET['name'];

	if (!Assets::isValidAssetName($name)) {
	- die("Invalid resource name: $name");
	+ throw new \RuntimeException("Invalid resource name: $name");
	}

	switch ($_GET['resource']) {
	@@ -58,7 +57,7 @@
	break;

	default;
	- die("Resource not found.");
	+ throw new \RuntimeException("esource not found.");
	}
	}
	}
	diff --git a/app/Console/Commands/AccountReset.php b/app/Console/Commands/AccountReset.php
	--- a/app/Console/Commands/AccountReset.php
	+++ b/app/Console/Commands/AccountReset.php
	@@ -105,7 +105,7 @@
	$success = $this->sendResetMail();
	if (!$success) {
	$this->error("The user has been found, but the password broker considers this user is invalid.");
	- exit;
	+ return;
	}

	//Regular output