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
Whitespace correction
[lhc/web/wiklou.git]
/
api.php
diff --git
a/api.php
b/api.php
index
e55ec75
..
2a6a095
100644
(file)
--- a/
api.php
+++ b/
api.php
@@
-34,7
+34,7
@@
define( 'MW_API', true );
// Bail if PHP is too low
define( 'MW_API', true );
// Bail if PHP is too low
-if ( !function_exists( 'version_compare' ) || version_compare(
phpversion()
, '5.3.2' ) < 0 ) {
+if ( !function_exists( 'version_compare' ) || version_compare(
PHP_VERSION
, '5.3.2' ) < 0 ) {
// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
require dirname( __FILE__ ) . '/includes/PHPVersionError.php';
wfPHPVersionError( 'api.php' );
// We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+
require dirname( __FILE__ ) . '/includes/PHPVersionError.php';
wfPHPVersionError( 'api.php' );
@@
-104,12
+104,17
@@
if ( $wgAPIRequestLog ) {
wfTimestamp( TS_MW ),
$endtime - $starttime,
$wgRequest->getIP(),
wfTimestamp( TS_MW ),
$endtime - $starttime,
$wgRequest->getIP(),
- $
_SERVER['HTTP_USER_AGENT']
+ $
wgRequest->getHeader( 'User-agent' )
);
$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
if ( $processor ) {
);
$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
if ( $processor ) {
- $module = $processor->getModule();
- if ( $module->mustBePosted() ) {
+ try {
+ $manager = $processor->getModuleManager();
+ $module = $manager->getModule( $wgRequest->getVal( 'action' ), 'action' );
+ } catch ( Exception $ex ) {
+ $module = null;
+ }
+ if ( !$module || $module->mustBePosted() ) {
$items[] = "action=" . $wgRequest->getVal( 'action' );
} else {
$items[] = wfArrayToCgi( $wgRequest->getValues() );
$items[] = "action=" . $wgRequest->getVal( 'action' );
} else {
$items[] = wfArrayToCgi( $wgRequest->getValues() );