summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Log.php3
-rw-r--r--lib/private/legacy/app.php6
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 0a707f3d4ea..3e0734965b0 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -86,6 +86,9 @@ class Log implements ILogger {
'calculateHMAC',
'encrypt',
'decrypt',
+
+ //LoginController
+ 'tryLogin'
];
/**
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index ceb36449bf0..955173fe176 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -66,6 +66,7 @@ class OC_App {
static private $appTypes = array();
static private $loadedApps = array();
static private $altLogin = array();
+ static private $alreadyRegistered = [];
const officialApp = 200;
/**
@@ -167,6 +168,11 @@ class OC_App {
* @param string $path
*/
public static function registerAutoloading($app, $path) {
+ $key = $app . '-' . $path;
+ if(isset(self::$alreadyRegistered[$key])) {
+ return;
+ }
+ self::$alreadyRegistered[$key] = true;
// Register on PSR-4 composer autoloader
$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);