| Index: trunk/extensions/LiquidThreads/pages/TalkpageView.php |
| — | — | @@ -42,9 +42,12 @@ |
| 43 | 43 | $actionLinks[] = $sk->link( $this->title, |
| 44 | 44 | wfMsgExt( 'history_short', 'parseinline' ) . "↑", |
| 45 | 45 | array(), array( 'action' => 'history' ) ); |
| 46 | | - $actionLinks[] = $sk->link( $this->title, |
| 47 | | - wfMsgExt( 'delete', 'parseinline' ) . '↑', |
| 48 | | - array(), array( 'action' => 'delete' ) ); |
| | 46 | + |
| | 47 | + if ( $wgUser->isAllowed( 'delete' ) ) { |
| | 48 | + $actionLinks[] = $sk->link( $this->title, |
| | 49 | + wfMsgExt( 'delete', 'parseinline' ) . '↑', |
| | 50 | + array(), array( 'action' => 'delete' ) ); |
| | 51 | + } |
| 49 | 52 | |
| 50 | 53 | $actions = ''; |
| 51 | 54 | foreach( $actionLinks as $link ) { |
| Index: trunk/extensions/LiquidThreads/lqt.js |
| — | — | @@ -323,7 +323,8 @@ |
| 324 | 324 | |
| 325 | 325 | if ( scrollTop > toolbarTop ) { |
| 326 | 326 | toolbar.css( 'top', scrollTop ); |
| 327 | | - } else if ( toolbar.css('top') && scrollTop < toolbarTop ) { |
| | 327 | + } else if ( toolbar.css('top') && toolbar.css('top') != 'auto' |
| | 328 | + && scrollTop < toolbarTop ) { |
| 328 | 329 | // Move back either to the start of the post, or to the scroll point |
| 329 | 330 | if ( scrollTop > postTop ) { |
| 330 | 331 | toolbar.css( 'top', scrollTop ); |