| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -669,7 +669,6 @@ |
| 670 | 670 | * @param $ts String: 14-character timestamp |
| 671 | 671 | * YYYYMMDDHHMMSS |
| 672 | 672 | * 01234567890123 |
| 673 | | - * @todo emulation of "o" format character for PHP pre 5.1.0 |
| 674 | 673 | * @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai? |
| 675 | 674 | */ |
| 676 | 675 | function sprintfDate( $format, $ts ) { |
| — | — | @@ -844,18 +843,11 @@ |
| 845 | 844 | } |
| 846 | 845 | $num = gmdate( 'L', $unix ); |
| 847 | 846 | break; |
| 848 | | - # 'o' is supported since PHP 5.1.0 |
| 849 | | - # return literal if not supported |
| 850 | | - # TODO: emulation for pre 5.1.0 versions |
| 851 | 847 | case 'o': |
| 852 | 848 | if ( !$unix ) { |
| 853 | 849 | $unix = wfTimestamp( TS_UNIX, $ts ); |
| 854 | 850 | } |
| 855 | | - if ( version_compare( PHP_VERSION, '5.1.0' ) === 1 ) { |
| 856 | | - $num = date( 'o', $unix ); |
| 857 | | - } else { |
| 858 | | - $s .= 'o'; |
| 859 | | - } |
| | 851 | + $num = date( 'o', $unix ); |
| 860 | 852 | break; |
| 861 | 853 | case 'Y': |
| 862 | 854 | $num = substr( $ts, 0, 4 ); |