| Index: trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php |
| — | — | @@ -114,8 +114,15 @@ |
| 115 | 115 | $this->expiry = strlen($this->expiry) ? $this->expiry : $this->expirySelection; |
| 116 | 116 | if( $this->expiry == 'existing' ) $this->expiry = $this->oldExpiry; |
| 117 | 117 | // Custom reason takes precedence |
| 118 | | - $this->reason = strlen($this->reason) || $this->reasonSelection == 'other' ? |
| 119 | | - $this->reason : $this->reasonSelection; |
| | 118 | + if( $this->reasonSelection != 'other' ) { |
| | 119 | + $comment = $this->reasonSelection; // start with dropdown reason |
| | 120 | + if( $this->reason != '' ) { |
| | 121 | + $comment .= ": {$this->reason}"; // append custom reason |
| | 122 | + } |
| | 123 | + } else { |
| | 124 | + $comment = $this->reason; // just use custom reason |
| | 125 | + } |
| | 126 | + $this->reason = $comment; |
| 120 | 127 | // Validate precedence setting |
| 121 | 128 | $allowed = array(FLAGGED_VIS_QUALITY,FLAGGED_VIS_LATEST,FLAGGED_VIS_PRISTINE); |
| 122 | 129 | if( $this->select && !in_array( $this->select, $allowed ) ) { |
| — | — | @@ -421,7 +428,7 @@ |
| 422 | 429 | } |
| 423 | 430 | $settings = '[' . implode(', ',$set). ']'; |
| 424 | 431 | # Append comment with settings (other than for resets) |
| 425 | | - $reason = ''; |
| | 432 | + $reason = $this->reason; |
| 426 | 433 | if( !$reset ) { |
| 427 | 434 | $reason = $this->reason ? "{$this->reason} $settings" : "$settings"; |
| 428 | 435 | $encodedExpiry = Block::encodeExpiry($expiry, $dbw ); |