| Index: trunk/phase3/CREDITS |
| — | — | @@ -79,6 +79,7 @@ |
| 80 | 80 | * Brent G |
| 81 | 81 | * Brianna Laugher |
| 82 | 82 | * Carlin |
| | 83 | +* Carsten Nielsen |
| 83 | 84 | * Conrad Irwin |
| 84 | 85 | * Dan Barrett |
| 85 | 86 | * Dan Nessett |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -246,6 +246,7 @@ |
| 247 | 247 | 'hideignorewarning' => $hideIgnoreWarning, |
| 248 | 248 | 'destwarningack' => (bool)$this->mDestWarningAck, |
| 249 | 249 | |
| | 250 | + 'description' => $this->mComment, |
| 250 | 251 | 'texttop' => $this->uploadFormTextTop, |
| 251 | 252 | 'textaftersummary' => $this->uploadFormTextAfterSummary, |
| 252 | 253 | 'destfile' => $this->mDesiredDestName, |
| — | — | @@ -740,6 +741,7 @@ |
| 741 | 742 | protected $mDestWarningAck; |
| 742 | 743 | protected $mDestFile; |
| 743 | 744 | |
| | 745 | + protected $mComment; |
| 744 | 746 | protected $mTextTop; |
| 745 | 747 | protected $mTextAfterSummary; |
| 746 | 748 | |
| — | — | @@ -754,6 +756,9 @@ |
| 755 | 757 | $this->mDestWarningAck = !empty( $options['destwarningack'] ); |
| 756 | 758 | $this->mDestFile = isset( $options['destfile'] ) ? $options['destfile'] : ''; |
| 757 | 759 | |
| | 760 | + $this->mComment = isset( $options['description'] ) ? |
| | 761 | + $options['description'] : ''; |
| | 762 | + |
| 758 | 763 | $this->mTextTop = isset( $options['texttop'] ) |
| 759 | 764 | ? $options['texttop'] : ''; |
| 760 | 765 | |
| — | — | @@ -930,6 +935,7 @@ |
| 931 | 936 | 'label-message' => $this->mForReUpload |
| 932 | 937 | ? 'filereuploadsummary' |
| 933 | 938 | : 'fileuploadsummary', |
| | 939 | + 'default' => $this->mComment, |
| 934 | 940 | 'cols' => intval( $wgUser->getOption( 'cols' ) ), |
| 935 | 941 | 'rows' => 8, |
| 936 | 942 | ) |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -442,6 +442,7 @@ |
| 443 | 443 | * Show "skin does not exist error" only when the skin is inputted in the wrong |
| 444 | 444 | case. |
| 445 | 445 | * (bug 26164) Potential html injection when the database server isn't available |
| | 446 | +* (bug 26160) Upload description set by extensions are not propagated |
| 446 | 447 | |
| 447 | 448 | === API changes in 1.17 === |
| 448 | 449 | * (bug 22738) Allow filtering by action type on query=logevent. |