Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/82/head
Maxence Lange 2018-11-29 16:41:12 -01:00 zatwierdzone przez Julius Härtl
rodzic 56d87e9bdb
commit 1c5ce8c269
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4C614C6ED2CDE6DF
2 zmienionych plików z 1 dodań i 31 usunięć

Wyświetl plik

@ -251,36 +251,6 @@ class NavigationController extends Controller {
return $this->navigate();
}
/**
* @NoCSRFRequired
* @PublicPage
*
* @param $username
*
* @return RedirectResponse|PublicTemplateResponse
*/
public function public($username) {
// Redirect to external instances
if (preg_match('/@[\w._-]+@[\w._-]+/', $username) === 1) {
$actor = $this->personService->getFromAccount(substr($username, 1));
return new RedirectResponse($actor->getUrl());
}
if (\OC::$server->getUserSession()
->isLoggedIn()) {
return $this->navigate();
}
$data = [
'serverData' => [
'public' => true,
]
];
$page = new PublicTemplateResponse(Application::APP_NAME, 'main', $data);
$page->setHeaderTitle($this->l10n->t('Social') . ' ' . $username);
return $page;
}
/**
*

Wyświetl plik

@ -134,7 +134,7 @@ class CoreRequestBuilder {
* @param string $username
*/
protected function limitToPreferredUsername(IQueryBuilder &$qb, string $username) {
$this->limitToDBField($qb, 'preferred_username', $username);
$this->limitToDBField($qb, 'preferred_username', $username, false);
}
/**