| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -953,7 +953,7 @@ |
| 954 | 954 | function wfMsg( $key ) { |
| 955 | 955 | $args = func_get_args(); |
| 956 | 956 | array_shift( $args ); |
| 957 | | - return wfMsgReal( $key, $args, true ); |
| | 957 | + return wfMsgReal( $key, $args ); |
| 958 | 958 | } |
| 959 | 959 | |
| 960 | 960 | /** |
| — | — | @@ -1051,7 +1051,7 @@ |
| 1052 | 1052 | * @param $transform Boolean: whether to parse magic words, etc. |
| 1053 | 1053 | * @return string |
| 1054 | 1054 | */ |
| 1055 | | -function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) { |
| | 1055 | +function wfMsgGetKey( $key, $useDB = true, $langCode = false, $transform = true ) { |
| 1056 | 1056 | wfRunHooks( 'NormalizeMessageKey', array( &$key, &$useDB, &$langCode, &$transform ) ); |
| 1057 | 1057 | |
| 1058 | 1058 | $cache = MessageCache::singleton(); |
| — | — | @@ -1106,7 +1106,7 @@ |
| 1107 | 1107 | function wfMsgHtml( $key ) { |
| 1108 | 1108 | $args = func_get_args(); |
| 1109 | 1109 | array_shift( $args ); |
| 1110 | | - return wfMsgReplaceArgs( htmlspecialchars( wfMsgGetKey( $key, true ) ), $args ); |
| | 1110 | + return wfMsgReplaceArgs( htmlspecialchars( wfMsgGetKey( $key ) ), $args ); |
| 1111 | 1111 | } |
| 1112 | 1112 | |
| 1113 | 1113 | /** |
| — | — | @@ -1124,7 +1124,7 @@ |
| 1125 | 1125 | $args = func_get_args(); |
| 1126 | 1126 | array_shift( $args ); |
| 1127 | 1127 | return wfMsgReplaceArgs( |
| 1128 | | - MessageCache::singleton()->parse( wfMsgGetKey( $key, true ), null, /* can't be set to false */ true )->getText(), |
| | 1128 | + MessageCache::singleton()->parse( wfMsgGetKey( $key ), null, /* can't be set to false */ true )->getText(), |
| 1129 | 1129 | $args ); |
| 1130 | 1130 | } |
| 1131 | 1131 | |