| Index: trunk/phase3/includes/interwiki/Interwiki.php |
| — | — | @@ -130,6 +130,7 @@ |
| 131 | 131 | $value = ''; |
| 132 | 132 | } |
| 133 | 133 | |
| | 134 | + |
| 134 | 135 | return $value; |
| 135 | 136 | } |
| 136 | 137 | |
| Index: trunk/phase3/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -195,6 +195,7 @@ |
| 196 | 196 | * @param $type string |
| 197 | 197 | * @param $action string |
| 198 | 198 | * @param $ts |
| | 199 | + * @param $legacy bool |
| 199 | 200 | * @return array |
| 200 | 201 | */ |
| 201 | 202 | public static function addLogParams( $result, &$vals, $params, $type, $action, $ts, $legacy = false ) { |
| Index: trunk/phase3/includes/AjaxResponse.php |
| — | — | @@ -34,6 +34,9 @@ |
| 35 | 35 | /** Content of our HTTP response */ |
| 36 | 36 | private $mText; |
| 37 | 37 | |
| | 38 | + /** |
| | 39 | + * @param $text string|null |
| | 40 | + */ |
| 38 | 41 | function __construct( $text = null ) { |
| 39 | 42 | $this->mCacheDuration = null; |
| 40 | 43 | $this->mVary = null; |
| — | — | @@ -69,21 +72,28 @@ |
| 70 | 73 | $this->mDisabled = true; |
| 71 | 74 | } |
| 72 | 75 | |
| 73 | | - /** Add content to the response */ |
| | 76 | + /** |
| | 77 | + * Add content to the response |
| | 78 | + * @param $text string |
| | 79 | + */ |
| 74 | 80 | function addText( $text ) { |
| 75 | 81 | if ( ! $this->mDisabled && $text ) { |
| 76 | 82 | $this->mText .= $text; |
| 77 | 83 | } |
| 78 | 84 | } |
| 79 | 85 | |
| 80 | | - /** Output text */ |
| | 86 | + /** |
| | 87 | + * Output text |
| | 88 | + */ |
| 81 | 89 | function printText() { |
| 82 | 90 | if ( ! $this->mDisabled ) { |
| 83 | 91 | print $this->mText; |
| 84 | 92 | } |
| 85 | 93 | } |
| 86 | 94 | |
| 87 | | - /** Construct the header and output it */ |
| | 95 | + /** |
| | 96 | + * Construct the header and output it |
| | 97 | + */ |
| 88 | 98 | function sendHeaders() { |
| 89 | 99 | global $wgUseSquid, $wgUseESI; |
| 90 | 100 | |
| — | — | @@ -139,9 +149,10 @@ |
| 140 | 150 | /** |
| 141 | 151 | * checkLastModified tells the client to use the client-cached response if |
| 142 | 152 | * possible. If sucessful, the AjaxResponse is disabled so that |
| 143 | | - * any future call to AjaxResponse::printText() have no effect. The method |
| 144 | | - * returns true iff the response code was set to 304 Not Modified. |
| 145 | | - * @return bool |
| | 153 | + * any future call to AjaxResponse::printText() have no effect. |
| | 154 | + * |
| | 155 | + * @param $timestamp string |
| | 156 | + * @return bool Returns true if the response code was set to 304 Not Modified. |
| 146 | 157 | */ |
| 147 | 158 | function checkLastModified ( $timestamp ) { |
| 148 | 159 | global $wgCachePages, $wgCacheEpoch, $wgUser; |
| — | — | @@ -149,17 +160,17 @@ |
| 150 | 161 | |
| 151 | 162 | if ( !$timestamp || $timestamp == '19700101000000' ) { |
| 152 | 163 | wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n" ); |
| 153 | | - return; |
| | 164 | + return false; |
| 154 | 165 | } |
| 155 | 166 | |
| 156 | 167 | if ( !$wgCachePages ) { |
| 157 | 168 | wfDebug( "$fname: CACHE DISABLED\n", false ); |
| 158 | | - return; |
| | 169 | + return false; |
| 159 | 170 | } |
| 160 | 171 | |
| 161 | 172 | if ( $wgUser->getOption( 'nocache' ) ) { |
| 162 | 173 | wfDebug( "$fname: USER DISABLED CACHE\n", false ); |
| 163 | | - return; |
| | 174 | + return false; |
| 164 | 175 | } |
| 165 | 176 | |
| 166 | 177 | $timestamp = wfTimestamp( TS_MW, $timestamp ); |
| — | — | @@ -192,6 +203,7 @@ |
| 193 | 204 | wfDebug( "$fname: client did not send If-Modified-Since header\n", false ); |
| 194 | 205 | $this->mLastModified = $lastmod; |
| 195 | 206 | } |
| | 207 | + return false; |
| 196 | 208 | } |
| 197 | 209 | |
| 198 | 210 | /** |