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
Use local context to get messages
[lhc/web/wiklou.git]
/
api.php
diff --git
a/api.php
b/api.php
index
39d27dd
..
a5a2579
100644
(file)
--- a/
api.php
+++ b/
api.php
@@
-68,11
+68,13
@@
if ( !$wgEnableAPI ) {
// Selectively allow cross-site AJAX
// Selectively allow cross-site AJAX
-/*
+/*
*
* Helper function to convert wildcard string into a regex
* '*' => '.*?'
* '?' => '.'
* Helper function to convert wildcard string into a regex
* '*' => '.*?'
* '?' => '.'
- * @ return string
+ *
+ * @param $search string
+ * @return string
*/
function convertWildcard( $search ) {
$search = preg_quote( $search, '/' );
*/
function convertWildcard( $search ) {
$search = preg_quote( $search, '/' );
@@
-115,7
+117,7
@@
$processor = new ApiMain( $wgRequest, $wgEnableWriteAPI );
$processor->execute();
// Execute any deferred updates
$processor->execute();
// Execute any deferred updates
-
wfD
oUpdates();
+
DeferredUpdates::d
oUpdates();
// Log what the user did, for book-keeping purposes.
$endtime = microtime( true );
// Log what the user did, for book-keeping purposes.
$endtime = microtime( true );
@@
-127,7
+129,7
@@
if ( $wgAPIRequestLog ) {
$items = array(
wfTimestamp( TS_MW ),
$endtime - $starttime,
$items = array(
wfTimestamp( TS_MW ),
$endtime - $starttime,
-
wfG
etIP(),
+
$wgRequest->g
etIP(),
$_SERVER['HTTP_USER_AGENT']
);
$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
$_SERVER['HTTP_USER_AGENT']
);
$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';