| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1024,38 +1024,6 @@ |
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | /** |
| 1028 | | - * Get a message from the language file, for the UI elements |
| 1029 | | - * |
| 1030 | | - * @deprecated since 1.18; use wfMessage() |
| 1031 | | - */ |
| 1032 | | -function wfMsgNoDB( $key ) { |
| 1033 | | - wfDeprecated( __FUNCTION__ ); |
| 1034 | | - $args = func_get_args(); |
| 1035 | | - array_shift( $args ); |
| 1036 | | - return wfMsgReal( $key, $args, false ); |
| 1037 | | -} |
| 1038 | | - |
| 1039 | | -/** |
| 1040 | | - * Get a message from the language file, for the content |
| 1041 | | - * |
| 1042 | | - * @deprecated since 1.18; use wfMessage() |
| 1043 | | - */ |
| 1044 | | -function wfMsgNoDBForContent( $key ) { |
| 1045 | | - wfDeprecated( __FUNCTION__ ); |
| 1046 | | - global $wgForceUIMsgAsContentMsg; |
| 1047 | | - $args = func_get_args(); |
| 1048 | | - array_shift( $args ); |
| 1049 | | - $forcontent = true; |
| 1050 | | - if( is_array( $wgForceUIMsgAsContentMsg ) && |
| 1051 | | - in_array( $key, $wgForceUIMsgAsContentMsg ) ) |
| 1052 | | - { |
| 1053 | | - $forcontent = false; |
| 1054 | | - } |
| 1055 | | - return wfMsgReal( $key, $args, false, $forcontent ); |
| 1056 | | -} |
| 1057 | | - |
| 1058 | | - |
| 1059 | | -/** |
| 1060 | 1028 | * Really get a message |
| 1061 | 1029 | * |
| 1062 | 1030 | * @param $key String: key to get. |
| — | — | @@ -1074,22 +1042,6 @@ |
| 1075 | 1043 | } |
| 1076 | 1044 | |
| 1077 | 1045 | /** |
| 1078 | | - * This function provides the message source for messages to be edited which are *not* stored in the database. |
| 1079 | | - * |
| 1080 | | - * @deprecated since 1.18; use wfMessage() |
| 1081 | | - * @param $key String |
| 1082 | | - */ |
| 1083 | | -function wfMsgWeirdKey( $key ) { |
| 1084 | | - wfDeprecated( __FUNCTION__ ); |
| 1085 | | - $source = wfMsgGetKey( $key, false, true, false ); |
| 1086 | | - if ( wfEmptyMsg( $key ) ) { |
| 1087 | | - return ''; |
| 1088 | | - } else { |
| 1089 | | - return $source; |
| 1090 | | - } |
| 1091 | | -} |
| 1092 | | - |
| 1093 | | -/** |
| 1094 | 1046 | * Fetch a message string value, but don't replace any keys yet. |
| 1095 | 1047 | * |
| 1096 | 1048 | * @param $key String |