dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use utf8 charset for searchindex MySQL table"
[lhc/web/wiklou.git]
/
includes
/
Wiki.php
diff --git
a/includes/Wiki.php
b/includes/Wiki.php
index
6ac9341
..
0683d7c
100644
(file)
--- a/
includes/Wiki.php
+++ b/
includes/Wiki.php
@@
-428,7
+428,8
@@
class MediaWiki {
$act = $this->getAction();
$act = $this->getAction();
- $action = Action::factory( $act, $page );
+ $action = Action::factory( $act, $page, $this->context );
+
if ( $action instanceof Action ) {
# Let Squid cache things if we can purge them.
if ( $wgUseSquid &&
if ( $action instanceof Action ) {
# Let Squid cache things if we can purge them.
if ( $wgUseSquid &&
@@
-508,6
+509,8
@@
class MediaWiki {
// preference set, redirect them to HTTPS.
if (
(
// preference set, redirect them to HTTPS.
if (
(
+ $request->getCookie( 'forceHTTPS', '' ) ||
+ // check for prefixed version for currently logged in users
$request->getCookie( 'forceHTTPS' ) ||
// Avoid checking the user and groups unless it's enabled.
(
$request->getCookie( 'forceHTTPS' ) ||
// Avoid checking the user and groups unless it's enabled.
(