diff options
| -rw-r--r-- | apps/comments/appinfo/app.php | 11 | ||||
| -rw-r--r-- | apps/files_sharing/css/sharetabview.scss | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 12 | ||||
| -rw-r--r-- | core/css/guest.css | 5 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | lib/private/Server.php | 16 | ||||
| -rw-r--r-- | version.php | 4 |
7 files changed, 26 insertions, 25 deletions
diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php index e6974111811..15c545ae1e4 100644 --- a/apps/comments/appinfo/app.php +++ b/apps/comments/appinfo/app.php @@ -60,14 +60,3 @@ $commentsManager->registerEventHandler(function () { $handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class); return $handler; }); -$commentsManager->registerDisplayNameResolver('user', function($id) { - $manager = \OC::$server->getUserManager(); - $user = $manager->get($id); - if(is_null($user)) { - $l = \OC::$server->getL10N('comments'); - $displayName = $l->t('Unknown user'); - } else { - $displayName = $user->getDisplayName(); - } - return $displayName; -}); diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 4d07e547e86..6635546067b 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -14,7 +14,6 @@ } .shareTabView .shareWithRemoteInfo, -.shareTabView .clipboardButton, .shareTabView .linkPass .icon-loading-small { position: absolute; right: -7px; @@ -38,7 +37,6 @@ position: relative; top: initial; right: initial; - padding: 18px 0 18px 36px; } .shareTabView label { diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 95710cd37f2..27fda38a737 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -1253,11 +1253,13 @@ class Access extends LDAPUtility implements IUserTools { unset($item[$key]['count']); } if($key !== 'dn') { - $selection[$i][$key] = $this->resemblesDN($key) ? - $this->helper->sanitizeDN($item[$key]) - : $key === 'objectguid' || $key === 'guid' ? - $selection[$i][$key] = $this->convertObjectGUID2Str($item[$key]) - : $item[$key]; + if($this->resemblesDN($key)) { + $selection[$i][$key] = $this->helper->sanitizeDN($item[$key]); + } else if($key === 'objectguid' || $key === 'guid') { + $selection[$i][$key] = [$this->convertObjectGUID2Str($item[$key][0])]; + } else { + $selection[$i][$key] = $item[$key]; + } } else { $selection[$i][$key] = [$this->helper->sanitizeDN($item[$key])]; } diff --git a/core/css/guest.css b/core/css/guest.css index b03e8d55efb..4256c66302f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -86,7 +86,7 @@ body { } .wrapper { width: 300px; - margin-top: 10%; + margin-top: 10vh; } /* Default FORM */ @@ -721,8 +721,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- } /* FOOTER */ -footer, -.push { +footer { height: 70px; margin-top: auto; } diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index ce0eccb971d..4d06fc294d5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -38,7 +38,6 @@ </header> <?php endif; ?> <?php print_unescaped($_['content']); ?> - <div class="push"></div><!-- for sticky footer --> </div> </div> <footer role="contentinfo"> diff --git a/lib/private/Server.php b/lib/private/Server.php index 8a5fb0fa96c..6898e93e3bb 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -897,7 +897,21 @@ class Server extends ServerContainer implements IServerContainer { $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory'); /** @var \OCP\Comments\ICommentsManagerFactory $factory */ $factory = new $factoryClass($this); - return $factory->getManager(); + $manager = $factory->getManager(); + + $manager->registerDisplayNameResolver('user', function($id) use ($c) { + $manager = $c->getUserManager(); + $user = $manager->get($id); + if(is_null($user)) { + $l = $c->getL10N('core'); + $displayName = $l->t('Unknown user'); + } else { + $displayName = $user->getDisplayName(); + } + return $displayName; + }); + + return $manager; }); $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class); diff --git a/version.php b/version.php index 4841acdd1f6..53272cf32fe 100644 --- a/version.php +++ b/version.php @@ -29,10 +29,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(13, 0, 0, 7); +$OC_Version = array(13, 0, 0, 8); // The human readable string -$OC_VersionString = '13.0.0 Beta 2'; +$OC_VersionString = '13.0.0 Beta 3'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |