From 19a24e58599401a7566e825bcbcde8894c7f843a Mon Sep 17 00:00:00 2001 From: Harald Hanche-Olsen Date: Sun, 5 Oct 2014 18:38:53 +0200 Subject: Fix brokan format string --- inc/lang/no/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 5e508617e..aeea982f2 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -116,7 +116,7 @@ $lang['searchmedia_in'] = 'Søk i %s'; $lang['txt_upload'] = 'Velg fil som skal lastes opp:'; $lang['txt_filename'] = 'Skriv inn wikinavn (alternativt):'; $lang['txt_overwrt'] = 'Overskriv eksisterende fil'; -$lang['maxuploadsize'] = 'Opplast maks % per fil.'; +$lang['maxuploadsize'] = 'Opplast maks %s per fil.'; $lang['lockedby'] = 'Låst av:'; $lang['lockexpire'] = 'Låsingen utløper:'; $lang['js']['willexpire'] = 'Din redigeringslås for dette dokumentet kommer snart til å utløpe.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.'; -- cgit v1.2.3 From 60aca4b904310fc764389d058c23e7b978b513a3 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 6 Oct 2014 14:59:03 +0200 Subject: do not use Accept-Encoding in browser UID Since Chrome 37, they send differen accept encodings for POST and GET requests which will break BrowserUID checks as reported in cosmocode/dokuwiki-plugin-oauth/issues/3 See https://code.google.com/p/chromium/issues/detail?id=410559 for official bug report at Google --- inc/auth.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index e938830ef..4b1e6ce31 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -335,7 +335,6 @@ function auth_browseruid() { $ip = clientIP(true); $uid = ''; $uid .= $INPUT->server->str('HTTP_USER_AGENT'); - $uid .= $INPUT->server->str('HTTP_ACCEPT_ENCODING'); $uid .= $INPUT->server->str('HTTP_ACCEPT_CHARSET'); $uid .= substr($ip, 0, strpos($ip, '.')); $uid = strtolower($uid); -- cgit v1.2.3