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 "Removed useless begin()/commit() calls as DBO_TRX is not on in cli mode."
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
dedfca9
..
5c5d7d1
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-332,9
+332,6
@@
if ( !$wgEnotifMinorEdits ) {
foreach( $wgDisabledActions as $action ){
$wgActions[$action] = false;
}
foreach( $wgDisabledActions as $action ){
$wgActions[$action] = false;
}
-if( !$wgAllowPageInfo ){
- $wgActions['info'] = false;
-}
if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
# see http://www.w3.org/TR/rdfa-in-html/#document-conformance
if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
# see http://www.w3.org/TR/rdfa-in-html/#document-conformance
@@
-372,7
+369,7
@@
if ( $wgNewUserLog ) {
}
if ( $wgCookieSecure === 'detect' ) {
}
if ( $wgCookieSecure === 'detect' ) {
- $wgCookieSecure = (
substr( $wgServer, 0, 6 ) === 'https:
' );
+ $wgCookieSecure = (
WebRequest::detectProtocol() === 'https
' );
}
// Disable MWDebug for command line mode, this prevents MWDebug from eating up
}
// Disable MWDebug for command line mode, this prevents MWDebug from eating up
@@
-449,7
+446,7
@@
if ( $wgCommandLineMode ) {
# Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
$wgRequest = new WebRequest;
# Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
$wgRequest = new WebRequest;
- $debug = "\n\nStart request {$
_SERVER['REQUEST_METHOD']
} {$wgRequest->getRequestURL()}\n";
+ $debug = "\n\nStart request {$
wgRequest->getMethod()
} {$wgRequest->getRequestURL()}\n";
if ( $wgDebugPrintHttpHeaders ) {
$debug .= "HTTP HEADERS:\n";
if ( $wgDebugPrintHttpHeaders ) {
$debug .= "HTTP HEADERS:\n";