| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -743,11 +743,10 @@ |
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | function closeRenameAndReopen( $newname ) { |
| 747 | | - if ( is_array($newname) ) { |
| 748 | | - if (count($newname) > 1) { |
| 749 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 750 | | - } |
| 751 | | - else { |
| | 747 | + if ( is_array( $newname ) ) { |
| | 748 | + if ( count( $newname ) > 1 ) { |
| | 749 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 750 | + } else { |
| 752 | 751 | $newname = $newname[0]; |
| 753 | 752 | } |
| 754 | 753 | } |
| — | — | @@ -759,11 +758,10 @@ |
| 760 | 759 | } |
| 761 | 760 | |
| 762 | 761 | function closeAndRename( $newname ) { |
| 763 | | - if ( is_array($newname) ) { |
| 764 | | - if (count($newname) > 1) { |
| 765 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 766 | | - } |
| 767 | | - else { |
| | 762 | + if ( is_array( $newname ) ) { |
| | 763 | + if ( count( $newname ) > 1 ) { |
| | 764 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 765 | + } else { |
| 768 | 766 | $newname = $newname[0]; |
| 769 | 767 | } |
| 770 | 768 | } |
| — | — | @@ -775,10 +773,9 @@ |
| 776 | 774 | |
| 777 | 775 | function rename( $newname ) { |
| 778 | 776 | if ( is_array($newname) ) { |
| 779 | | - if (count($newname) > 1) { |
| 780 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 781 | | - } |
| 782 | | - else { |
| | 777 | + if ( count( $newname ) > 1 ) { |
| | 778 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 779 | + } else { |
| 783 | 780 | $newname = $newname[0]; |
| 784 | 781 | } |
| 785 | 782 | } |
| — | — | @@ -806,7 +803,7 @@ |
| 807 | 804 | $command .= " > " . wfEscapeShellArg( $file ); |
| 808 | 805 | } |
| 809 | 806 | |
| 810 | | - $this->startCommand($command); |
| | 807 | + $this->startCommand( $command ); |
| 811 | 808 | $this->command = $command; |
| 812 | 809 | $this->filename = $file; |
| 813 | 810 | } |
| — | — | @@ -825,11 +822,10 @@ |
| 826 | 823 | * and reopen new file with the old name. |
| 827 | 824 | */ |
| 828 | 825 | function closeRenameAndReopen( $newname ) { |
| 829 | | - if ( is_array($newname) ) { |
| 830 | | - if (count($newname) > 1) { |
| 831 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 832 | | - } |
| 833 | | - else { |
| | 826 | + if ( is_array( $newname ) ) { |
| | 827 | + if ( count( $newname ) > 1) { |
| | 828 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 829 | + } else { |
| 834 | 830 | $newname = $newname[0]; |
| 835 | 831 | } |
| 836 | 832 | } |
| — | — | @@ -844,11 +840,10 @@ |
| 845 | 841 | } |
| 846 | 842 | |
| 847 | 843 | function closeAndRename( $newname ) { |
| 848 | | - if ( is_array($newname) ) { |
| 849 | | - if (count($newname) > 1) { |
| 850 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 851 | | - } |
| 852 | | - else { |
| | 844 | + if ( is_array( $newname ) ) { |
| | 845 | + if ( count( $newname ) > 1 ) { |
| | 846 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 847 | + } else { |
| 853 | 848 | $newname = $newname[0]; |
| 854 | 849 | } |
| 855 | 850 | } |
| — | — | @@ -861,11 +856,10 @@ |
| 862 | 857 | } |
| 863 | 858 | |
| 864 | 859 | function rename( $newname ) { |
| 865 | | - if ( is_array($newname) ) { |
| 866 | | - if (count($newname) > 1) { |
| 867 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 868 | | - } |
| 869 | | - else { |
| | 860 | + if ( is_array( $newname ) ) { |
| | 861 | + if ( count( $newname ) > 1) { |
| | 862 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 863 | + } else { |
| 870 | 864 | $newname = $newname[0]; |
| 871 | 865 | } |
| 872 | 866 | } |
| — | — | @@ -922,26 +916,25 @@ |
| 923 | 917 | } |
| 924 | 918 | if ( $newname ) { |
| 925 | 919 | fclose( $this->handle ); |
| 926 | | - proc_close($this->procOpenResource); |
| | 920 | + proc_close( $this->procOpenResource ); |
| 927 | 921 | rename( $this->filename, $newname ); |
| 928 | 922 | $command = "7za a -bd -si " . wfEscapeShellArg( $file ); |
| 929 | 923 | $command .= ' >' . wfGetNull() . ' 2>&1'; |
| 930 | | - $this->startCommand($command); |
| | 924 | + $this->startCommand( $command ); |
| 931 | 925 | } |
| 932 | 926 | } |
| 933 | 927 | |
| 934 | 928 | function closeAndRename( $newname ) { |
| 935 | | - if ( is_array($newname) ) { |
| 936 | | - if (count($newname) > 1) { |
| 937 | | - throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n"); |
| 938 | | - } |
| 939 | | - else { |
| | 929 | + if ( is_array( $newname ) ) { |
| | 930 | + if ( count( $newname ) > 1 ) { |
| | 931 | + throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" ); |
| | 932 | + } else { |
| 940 | 933 | $newname = $newname[0]; |
| 941 | 934 | } |
| 942 | 935 | } |
| 943 | 936 | if ( $newname ) { |
| 944 | 937 | fclose( $this->handle ); |
| 945 | | - proc_close($this->procOpenResource); |
| | 938 | + proc_close( $this->procOpenResource ); |
| 946 | 939 | rename( $this->filename, $newname ); |
| 947 | 940 | } |
| 948 | 941 | } |