| Index: branches/wmf/1.18wmf1/includes/Html.php |
| — | — | @@ -609,7 +609,16 @@ |
| 610 | 610 | } |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | | - return self::element( 'textarea', $attribs, $value ); |
| | 613 | + if (substr($value, 0, 1) == "\n") { |
| | 614 | + // Workaround for bug 12130: browsers eat the initial newline |
| | 615 | + // assuming that it's just for show, but they do keep the later |
| | 616 | + // newlines, which we may want to preserve during editing. |
| | 617 | + // Prepending a single newline |
| | 618 | + $spacedValue = "\n" . $value; |
| | 619 | + } else { |
| | 620 | + $spacedValue = $value; |
| | 621 | + } |
| | 622 | + return self::element( 'textarea', $attribs, $spacedValue ); |
| 614 | 623 | } |
| 615 | 624 | |
| 616 | 625 | /** |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialBlockList.php |
| — | — | @@ -317,7 +317,7 @@ |
| 318 | 318 | if ( $row->ipb_create_account ) { |
| 319 | 319 | $properties[] = $msg['createaccountblock']; |
| 320 | 320 | } |
| 321 | | - if ( !$row->ipb_enable_autoblock ) { |
| | 321 | + if ( $row->ipb_user && !$row->ipb_enable_autoblock ) { |
| 322 | 322 | $properties[] = $msg['noautoblockblock']; |
| 323 | 323 | } |
| 324 | 324 | |
| — | — | @@ -346,6 +346,7 @@ |
| 347 | 347 | 'fields' => array( |
| 348 | 348 | 'ipb_id', |
| 349 | 349 | 'ipb_address', |
| | 350 | + 'ipb_user', |
| 350 | 351 | 'ipb_by', |
| 351 | 352 | 'ipb_reason', |
| 352 | 353 | 'ipb_timestamp', |
| Property changes on: branches/wmf/1.18wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 353 | 354 | Merged /trunk/phase3/includes/specials:r98578,98598,98656 |
| Index: branches/wmf/1.18wmf1/includes/SpecialPage.php |
| — | — | @@ -694,7 +694,12 @@ |
| 695 | 695 | * @see wfMessage |
| 696 | 696 | */ |
| 697 | 697 | public function msg( /* $args */ ) { |
| 698 | | - return call_user_func_array( array( $this->getContext(), 'msg' ), func_get_args() ); |
| | 698 | + // Note: can't use func_get_args() directly as second or later item in |
| | 699 | + // a parameter list until PHP 5.3 or you get a fatal error. |
| | 700 | + // Works fine as the first parameter, which appears elsewhere in the |
| | 701 | + // code base. Sighhhh. |
| | 702 | + $args = func_get_args(); |
| | 703 | + return call_user_func_array( array( $this->getContext(), 'msg' ), $args ); |
| 699 | 704 | } |
| 700 | 705 | |
| 701 | 706 | /** |
| Property changes on: branches/wmf/1.18wmf1/includes/SpecialPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 702 | 707 | Merged /trunk/phase3/includes/SpecialPage.php:r98578,98598,98656 |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 703 | 708 | Merged /trunk/phase3/includes:r98578,98598,98656 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 704 | 709 | Merged /trunk/phase3:r98578,98598,98656 |