diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/Search/Provider/File.php | 1 | ||||
| -rw-r--r-- | lib/private/Template/Base.php | 3 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Template.php | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 9c914f15431..5b211a2d180 100644 --- a/lib/base.php +++ b/lib/base.php @@ -371,7 +371,6 @@ class OC { $oldTheme = $systemConfig->getValue('theme'); $systemConfig->setValue('theme', ''); - OC_Util::addScript('config'); // needed for web root OC_Util::addScript('update'); /** @var \OC\App\AppManager $appManager */ diff --git a/lib/private/Search/Provider/File.php b/lib/private/Search/Provider/File.php index e2ae328b1d3..b4e35d374ca 100644 --- a/lib/private/Search/Provider/File.php +++ b/lib/private/Search/Provider/File.php @@ -44,6 +44,7 @@ class File extends \OCP\Search\Provider { * @deprecated 20.0.0 */ public function search($query) { + \OC_Util::setupFS(); $files = Filesystem::search($query); $results = []; // edit results diff --git a/lib/private/Template/Base.php b/lib/private/Template/Base.php index 04d03b6e6f5..21f2b33cfa3 100644 --- a/lib/private/Template/Base.php +++ b/lib/private/Template/Base.php @@ -31,6 +31,7 @@ namespace OC\Template; use OCP\Defaults; +use Throwable; class Base { private $template; // The template @@ -92,7 +93,7 @@ class Base { /** * Assign variables * @param string $key key - * @param array|bool|integer|string $value value + * @param array|bool|integer|string|Throwable $value value * @return bool * * This function assigns a variable. It can be accessed via $_[$key] in diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index c14a43ea430..2ddb55096ad 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -325,7 +325,7 @@ class OC_Template extends \OC\Template\Base { $content->assign('errorCode', $exception->getCode()); $content->assign('file', $exception->getFile()); $content->assign('line', $exception->getLine()); - $content->assign('trace', $exception->getTraceAsString()); + $content->assign('exception', $exception); $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); $content->assign('remoteAddr', $request->getRemoteAddress()); $content->assign('requestID', $request->getId()); |