Merge pull request #2721 from nextcloud/ocs-die-on-exception · 4f79d2ff0d - nextcloud - source @ dussan.org

Merge pull request #2721 from nextcloud/ocs-die-on-exception

[downstream] Die in OCS v1.php on exception

tags/v12.0.0beta1

Roeland Jago Douma 7 years ago

parent

f54547ff1c 00f135d320

commit

4f79d2ff0d

1 changed files with 3 additions and 1 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 1
						
ocs/v1.phpView File
								
			@@ -65,8 +65,10 @@ try {
		
			} catch (MethodNotAllowedException $e) {
		
				OC_API::setContentType();
		
				OC_Response::setStatus(405);
		
			} catch (\OC\OCS\Exception $ex) {
		
				exit();
		
			} catch (Exception $ex) {
		
				OC_API::respond($ex->getResult(), OC_API::requestedFormat());
		
				exit();
		
			}
		
			/*