diff options
author | Bart Visscher <bartv@thisnet.nl> | 2013-06-27 17:51:37 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2013-06-27 17:54:17 +0200 |
commit | c6bbccc776ee9ea1112d3cfab54c9f2c95540130 (patch) | |
tree | 799c938b8d314a4f49fdeba43f5b42e212f77fcd /lib/hintexception.php | |
parent | 969e43c87b7afb6184846fe27849167c9c6f5eab (diff) | |
parent | 6fcee1ee117a167aa0c526ca39effbf086d10991 (diff) | |
download | nextcloud-server-c6bbccc776ee9ea1112d3cfab54c9f2c95540130.tar.gz nextcloud-server-c6bbccc776ee9ea1112d3cfab54c9f2c95540130.zip |
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
lib/setup.php
Diffstat (limited to 'lib/hintexception.php')
-rw-r--r-- | lib/hintexception.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/hintexception.php b/lib/hintexception.php index c8bff750033..3934ae2a4c2 100644 --- a/lib/hintexception.php +++ b/lib/hintexception.php @@ -12,7 +12,7 @@ class HintException extends \Exception { private $hint; - public function __construct($message, $hint, $code = 0, Exception $previous = null) { + public function __construct($message, $hint = '', $code = 0, Exception $previous = null) { $this->hint = $hint; parent::__construct($message, $code, $previous); } |