| Index: branches/js2-work/phase3/includes/Setup.php |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | wfMemoryLimit(); |
| 167 | 167 | |
| 168 | 168 | /** |
| 169 | | - * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+ |
| | 169 | + * Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+ |
| 170 | 170 | * that happens whenever you use a date function without the timezone being |
| 171 | 171 | * explicitly set. Inspired by phpMyAdmin's treatment of the problem. |
| 172 | 172 | */ |
| — | — | @@ -351,7 +351,7 @@ |
| 352 | 352 | # this can't be done in a normal extension type way |
| 353 | 353 | # since the script-loader is an entry point |
| 354 | 354 | # |
| 355 | | -$wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js/mwEmbed/includes/languages/mwEmbed.i18n.php"; |
| | 355 | +$wgExtensionMessagesFiles['mwEmbed'] = "{$IP}/js/mwEmbed/languages/mwEmbed.i18n.php"; |
| 356 | 356 | |
| 357 | 357 | # Extension setup functions for extensions other than skins |
| 358 | 358 | # Entries should be added to this variable during the inclusion |
| Index: branches/js2-work/phase3/includes/api/ApiUpload.php |
| — | — | @@ -257,6 +257,7 @@ |
| 258 | 258 | } |
| 259 | 259 | return $result; |
| 260 | 260 | } |
| | 261 | + |
| 261 | 262 | if( !$this->mParams['ignorewarnings'] ) { |
| 262 | 263 | $warnings = $this->mUpload->checkWarnings(); |
| 263 | 264 | if( $warnings ) { |