Merged Wikia change.

[lhc/web/wiklou.git] / api.php

diff --git a/api.php b/api.php
index 39d27dd..154e168 100644 (file)
--- a/api.php
+++ b/api.php
@@ -68,11 +68,13 @@ if ( !$wgEnableAPI ) {
 
 // Selectively allow cross-site AJAX
 
-/*
+/**
  * Helper function to convert wildcard string into a regex
  * '*' => '.*?'
  * '?' => '.'
- * @ return string
+ *
+ * @param $search string
+ * @return string
  */
 function convertWildcard( $search ) {
        $search = preg_quote( $search, '/' );
@@ -103,6 +105,9 @@ if ( $wgCrossSiteAJAXdomains && isset( $_SERVER['HTTP_ORIGIN'] ) ) {
 
 // Set a dummy $wgTitle, because $wgTitle == null breaks various things
 // In a perfect world this wouldn't be necessary
+//
+// @todo @fixme Ummmm, doesn't this line make the PHP4 check at the top completely
+// useless? Suggest moving more stuff out of api.php like we did with index.php
 $wgTitle = Title::makeTitle( NS_MAIN, 'API' );
 
 /* Construct an ApiMain with the arguments passed via the URL. What we get back
@@ -127,7 +132,7 @@ if ( $wgAPIRequestLog ) {
        $items = array(
                        wfTimestamp( TS_MW ),
                        $endtime - $starttime,
-                       wfGetIP(),
+                       $wgRequest->getIP(),
                        $_SERVER['HTTP_USER_AGENT']
        );
        $items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';