| Index: branches/REL1_18/phase3/skins/common/shared.css |
| — | — | @@ -792,20 +792,6 @@ |
| 793 | 793 | right: 10px; |
| 794 | 794 | background-position: 0% 100%; |
| 795 | 795 | } |
| 796 | | -/* Table Sorting */ |
| 797 | | -th.headerSort { |
| 798 | | - background-image: url(images/sort_both.gif); |
| 799 | | - cursor: pointer; |
| 800 | | - background-repeat: no-repeat; |
| 801 | | - background-position: center right; |
| 802 | | - padding-right: 21px; |
| 803 | | -} |
| 804 | | -th.headerSortUp { |
| 805 | | - background-image: url(images/sort_up.gif); |
| 806 | | -} |
| 807 | | -th.headerSortDown { |
| 808 | | - background-image: url(images/sort_down.gif); |
| 809 | | -} |
| 810 | 796 | |
| 811 | 797 | /* LTR content in RTL layout */ |
| 812 | 798 | .ltr { |
| Index: branches/REL1_18/phase3/includes/Exception.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | $line = $this->getLine(); |
| 152 | 152 | $message = $this->getMessage(); |
| 153 | 153 | |
| 154 | | - if ( isset( $wgRequest ) ) { |
| | 154 | + if ( isset( $wgRequest ) && !$wgRequest instanceof FauxRequest ) { |
| 155 | 155 | $url = $wgRequest->getRequestURL(); |
| 156 | 156 | if ( !$url ) { |
| 157 | 157 | $url = '[no URL]'; |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 158 | 158 | Merged /trunk/phase3/includes:r97291 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 159 | 159 | Merged /trunk/phase3:r97291,98678 |