Permalink
Browse files

Merge branch 'MDL-58843-32-exchandler' of git://github.com/mudrd8mz/m…

…oodle into MOODLE_32_STABLE
  • Loading branch information...
dmonllao committed May 10, 2017
2 parents 01932fa + 00fe8e5 commit 3bd5edccf8ec6c08e612b61b8c7700f5c8870876
Showing with 4 additions and 4 deletions.
  1. +2 −2 mod/lti/classes/service_exception_handler.php
  2. +2 −2 webservice/xmlrpc/locallib.php
@@ -94,9 +94,9 @@ public function set_message_type($type) {
/**
* Echo an exception message encapsulated in XML.
*
* @param \Exception $exception The exception that was thrown
* @param \Exception|\Throwable $exception The exception that was thrown
*/
public function handle(\Exception $exception) {
public function handle($exception) {
$message = $exception->getMessage();
// Add the exception backtrace for developers.
@@ -161,11 +161,11 @@ protected function send_headers() {
/**
* Generate the XML-RPC fault response.
*
* @param Exception $ex The exception.
* @param Exception|Throwable $ex The exception.
* @param int $faultcode The faultCode to be included in the fault response
* @return string The XML-RPC fault response xml containing the faultCode and faultString.
*/
protected function generate_error(Exception $ex, $faultcode = 404) {
protected function generate_error($ex, $faultcode = 404) {
$error = $ex->getMessage();
if (!empty($ex->errorcode)) {

0 comments on commit 3bd5edc

Please sign in to comment.