| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -848,51 +848,7 @@ |
| 849 | 849 | return $string; |
| 850 | 850 | } |
| 851 | 851 | |
| 852 | | - |
| 853 | 852 | /** |
| 854 | | - * Just like exit() but makes a note of it. |
| 855 | | - * Commits open transactions except if the error parameter is set |
| 856 | | - * |
| 857 | | - * @deprecated Please return control to the caller or throw an exception. Will |
| 858 | | - * be removed in 1.19. |
| 859 | | - */ |
| 860 | | -function wfAbruptExit( $error = false ) { |
| 861 | | - static $called = false; |
| 862 | | - if ( $called ) { |
| 863 | | - exit( -1 ); |
| 864 | | - } |
| 865 | | - $called = true; |
| 866 | | - |
| 867 | | - wfDeprecated( __FUNCTION__ ); |
| 868 | | - $bt = wfDebugBacktrace(); |
| 869 | | - if( $bt ) { |
| 870 | | - for( $i = 0; $i < count( $bt ); $i++ ) { |
| 871 | | - $file = isset( $bt[$i]['file'] ) ? $bt[$i]['file'] : 'unknown'; |
| 872 | | - $line = isset( $bt[$i]['line'] ) ? $bt[$i]['line'] : 'unknown'; |
| 873 | | - wfDebug( "WARNING: Abrupt exit in $file at line $line\n"); |
| 874 | | - } |
| 875 | | - } else { |
| 876 | | - wfDebug( "WARNING: Abrupt exit\n" ); |
| 877 | | - } |
| 878 | | - |
| 879 | | - wfLogProfilingData(); |
| 880 | | - |
| 881 | | - if ( !$error ) { |
| 882 | | - wfGetLB()->closeAll(); |
| 883 | | - } |
| 884 | | - exit( -1 ); |
| 885 | | -} |
| 886 | | - |
| 887 | | -/** |
| 888 | | - * @deprecated Please return control the caller or throw an exception. Will |
| 889 | | - * be removed in 1.19. |
| 890 | | - */ |
| 891 | | -function wfErrorExit() { |
| 892 | | - wfDeprecated( __FUNCTION__ ); |
| 893 | | - wfAbruptExit( true ); |
| 894 | | -} |
| 895 | | - |
| 896 | | -/** |
| 897 | 853 | * Print an error message and die, returning nonzero to the shell if any. Plain die() |
| 898 | 854 | * fails to return nonzero to the shell if you pass a string. Entry points may customise |
| 899 | 855 | * this function to return a prettier error message, but implementations must not assume |
| — | — | @@ -2129,15 +2085,6 @@ |
| 2130 | 2086 | } |
| 2131 | 2087 | |
| 2132 | 2088 | /** |
| 2133 | | - * BC wrapper for MimeMagic::singleton() |
| 2134 | | - * @deprecated No longer needed as of 1.17 (r68836). Remove in 1.19. |
| 2135 | | - */ |
| 2136 | | -function &wfGetMimeMagic() { |
| 2137 | | - wfDeprecated( __FUNCTION__ ); |
| 2138 | | - return MimeMagic::singleton(); |
| 2139 | | -} |
| 2140 | | - |
| 2141 | | -/** |
| 2142 | 2089 | * Tries to get the system directory for temporary files. The TMPDIR, TMP, and |
| 2143 | 2090 | * TEMP environment variables are then checked in sequence, and if none are set |
| 2144 | 2091 | * try sys_get_temp_dir() for PHP >= 5.2.1. All else fails, return /tmp for Unix |