summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis <6653109+artonge@users.noreply.github.com>2022-01-19 18:04:19 +0100
committerGitHub <noreply@github.com>2022-01-19 18:04:19 +0100
commit3e262c7e3a20c47ddc08b720a75c202a505b7c94 (patch)
tree549a22d30a04d4425a3d3044a7275930f5d7dbfa
parent677b25b0d3fa258f920c8cca06e3ed069e9f18ed (diff)
parentefd32abeca68d16ba81d66429438aa83f7546d64 (diff)
downloadnextcloud-server-3e262c7e3a20c47ddc08b720a75c202a505b7c94.tar.gz
nextcloud-server-3e262c7e3a20c47ddc08b720a75c202a505b7c94.zip
Merge pull request #30745 from nextcloud/fix/dont_use_deprecated_methods
Use less deprecated methods in base.php
-rw-r--r--core/js/update.js1
-rw-r--r--lib/base.php8
2 files changed, 5 insertions, 4 deletions
diff --git a/core/js/update.js b/core/js/update.js
index 5c1054adcb4..1613c3cc93b 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -160,6 +160,7 @@ window.addEventListener('DOMContentLoaded', function() {
});
return false;
});
+
$('.update-show-detailed').on('click', function() {
$('#update-progress-detailed').toggleClass('hidden');
return false;
diff --git a/lib/base.php b/lib/base.php
index 0f08102c81f..6578d506796 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -365,10 +365,10 @@ class OC {
$oldTheme = $systemConfig->getValue('theme');
$systemConfig->setValue('theme', '');
- OC_Util::addScript('core', 'common');
- OC_Util::addScript('core', 'main');
- OC_Util::addTranslations('core');
- OC_Util::addScript('update', null, 'core');
+ \OCP\Util::addScript('core', 'common');
+ \OCP\Util::addScript('core', 'main');
+ \OCP\Util::addTranslations('core');
+ \OCP\Util::addScript('core', 'update');
/** @var \OC\App\AppManager $appManager */
$appManager = \OC::$server->getAppManager();