| Index: branches/REL1_17/phase3/includes/HTMLForm.php |
| — | — | @@ -1065,7 +1065,7 @@ |
| 1066 | 1066 | |
| 1067 | 1067 | # http://dev.w3.org/html5/spec/common-microsyntaxes.html#real-numbers |
| 1068 | 1068 | # with the addition that a leading '+' sign is ok. |
| 1069 | | - if ( !preg_match( '/^(\+|\-)?\d+(\.\d+)?(E(\+|\-)?\d+)?$/i', $value ) ) { |
| | 1069 | + if ( !preg_match( '/^((\+|\-)?\d+(\.\d+)?(E(\+|\-)?\d+)?)?$/i', $value ) ) { |
| 1070 | 1070 | return wfMsgExt( 'htmlform-float-invalid', 'parse' ); |
| 1071 | 1071 | } |
| 1072 | 1072 | |
| — | — | @@ -1108,7 +1108,7 @@ |
| 1109 | 1109 | # phone numbers when you know that they are integers (the HTML5 type=tel |
| 1110 | 1110 | # input does not require its value to be numeric). If you want a tidier |
| 1111 | 1111 | # value to, eg, save in the DB, clean it up with intval(). |
| 1112 | | - if ( !preg_match( '/^(\+|\-)?\d*$/', trim( $value ) ) |
| | 1112 | + if ( !preg_match( '/^((\+|\-)?\d+)?$/', trim( $value ) ) |
| 1113 | 1113 | ) { |
| 1114 | 1114 | return wfMsgExt( 'htmlform-int-invalid', 'parse' ); |
| 1115 | 1115 | } |
| Index: branches/REL1_17/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -87,7 +87,6 @@ |
| 88 | 88 | 'unblock' => array( 'ApiQueryInfo', 'getUnblockToken' ), |
| 89 | 89 | 'email' => array( 'ApiQueryInfo', 'getEmailToken' ), |
| 90 | 90 | 'import' => array( 'ApiQueryInfo', 'getImportToken' ), |
| 91 | | - 'patrol' => array( 'ApiQueryRecentChanges', 'getPatrolToken' ), |
| 92 | 91 | ); |
| 93 | 92 | wfRunHooks( 'APIQueryInfoTokens', array( &$this->tokenFunctions ) ); |
| 94 | 93 | return $this->tokenFunctions; |
| Index: branches/REL1_17/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1300,9 +1300,9 @@ |
| 1301 | 1301 | '''It has not yet been saved!'''", |
| 1302 | 1302 | 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript.''' |
| 1303 | 1303 | '''It has not yet been saved!'''", |
| 1304 | | -'sitecsspreview' => "'''Remember that you are only previewing this global CSS.''' |
| | 1304 | +'sitecsspreview' => "'''Remember that you are only previewing this CSS.''' |
| 1305 | 1305 | '''It has not yet been saved!'''", |
| 1306 | | -'sitejspreview' => "'''Remember that you are only previewing this global JavaScript code.''' |
| | 1306 | +'sitejspreview' => "'''Remember that you are only previewing this JavaScript code.''' |
| 1307 | 1307 | '''It has not yet been saved!'''", |
| 1308 | 1308 | 'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\". |
| 1309 | 1309 | Custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.", |