| Index: trunk/phase3/includes/MimeMagic.php |
| — | — | @@ -84,19 +84,19 @@ |
| 85 | 85 | * Mapping of media types to arrays of mime types. |
| 86 | 86 | * This is used by findMediaType and getMediaType, respectively |
| 87 | 87 | */ |
| 88 | | - var $mMediaTypes= NULL; |
| | 88 | + public static $mMediaTypes= NULL; |
| 89 | 89 | |
| 90 | 90 | /** Map of mime type aliases |
| 91 | 91 | */ |
| 92 | | - var $mMimeTypeAliases= NULL; |
| | 92 | + public static $mMimeTypeAliases= NULL; |
| 93 | 93 | |
| 94 | 94 | /** map of mime types to file extensions (as a space seprarated list) |
| 95 | 95 | */ |
| 96 | | - var $mMimeToExt= NULL; |
| | 96 | + public static $mMimeToExt= NULL; |
| 97 | 97 | |
| 98 | 98 | /** map of file extensions types to mime types (as a space seprarated list) |
| 99 | 99 | */ |
| 100 | | - var $mExtToMime= NULL; |
| | 100 | + public static $mExtToMime= NULL; |
| 101 | 101 | |
| 102 | 102 | /** The singleton instance |
| 103 | 103 | */ |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -772,7 +772,7 @@ |
| 773 | 773 | |
| 774 | 774 | wfProfileOut( "$fname-live" ); |
| 775 | 775 | |
| 776 | | - if( $this->loggedin ) { |
| | 776 | + if( $this->loggedin && 0) { |
| 777 | 777 | if( !$this->mTitle->userIsWatching()) { |
| 778 | 778 | $content_actions['watch'] = array( |
| 779 | 779 | 'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false, |
| Index: trunk/extensions/WebStore/WebStorePostFile.php |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class WebStorePostFile { |
| 5 | | - var $curl, $content, $outputFile, $errno, $error, $responseCode, $contentType, $success, |
| | 5 | + public static $curl, $content, $outputFile, $errno, $error, $responseCode, $contentType, $success, |
| 6 | 6 | $sourceFile, $sourcePath; |
| 7 | 7 | |
| 8 | 8 | static function post( $url, $fileParamName, $sourcePath, $params = array(), $proxy = false, |
| Index: trunk/extensions/WebStore/404-handler.php |
| — | — | @@ -30,8 +30,7 @@ |
| 31 | 31 | $this->real404(); |
| 32 | 32 | return true; |
| 33 | 33 | } |
| 34 | | - |
| 35 | | - $rel = substr( $url, strlen( $thumbBase ) + 1 ); // plus one for slash |
| | 34 | + $rel = substr( $url, strlen( $thumbBase ) + 1 ); //plus one for slash |
| 36 | 35 | // Check for path traversal |
| 37 | 36 | if ( !$this->validateFilename( $rel ) ) { |
| 38 | 37 | header( 'X-Debug: invalid path traversal' ); |
| — | — | @@ -41,6 +40,7 @@ |
| 42 | 41 | |
| 43 | 42 | if ( !preg_match( '!^(\w)/(\w\w)/([^/]*)/([^/]*)$!', $rel, $parts ) ) { |
| 44 | 43 | header( 'X-Debug: regex mismatch' ); |
| | 44 | + print $rel; |
| 45 | 45 | $this->real404(); |
| 46 | 46 | return false; |
| 47 | 47 | } |
| Index: trunk/extensions/ProofreadPage/proofread_index.js |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | |
| 15 | 15 | function proofreadpage_index_init() { |
| 16 | 16 | |
| 17 | | - if(!self.proofreadpage_debug) return; |
| | 17 | + if(!self.proofreadpage_debug) return; |
| 18 | 18 | |
| 19 | 19 | var toolbar = document.getElementById("toolbar"); |
| 20 | 20 | toolbar.parentNode.removeChild(toolbar); |
| — | — | @@ -86,6 +86,9 @@ |
| 87 | 87 | param_name = m[0]; |
| 88 | 88 | |
| 89 | 89 | value = form.elements[param_name].value; |
| | 90 | + //remove training \n |
| | 91 | + value = value.replace(/\n$/,''); |
| | 92 | + //replace pipe symbol |
| 90 | 93 | value = value.replace(/\|/g,'{{!}}'); |
| 91 | 94 | //not for links! |
| 92 | 95 | value = value.replace(/\[\[(.*?)\{\{!\}\}(.*?)\]\]/g,'[[$1|$2]]'); |