| Index: branches/liquidthreads/extensions/LqtExtension.php |
| — | — | @@ -15,7 +15,6 @@ |
| 16 | 16 | require_once('LqtModel.php'); |
| 17 | 17 | |
| 18 | 18 | class LqtDispatch { |
| 19 | | - /* Invoked from performAction() in Wiki.php if this is a discussion namespace. */ |
| 20 | 19 | static function talkpageMain(&$output, &$talk_article, &$title, &$user, &$request) { |
| 21 | 20 | // We are given a talkpage article and title. Find the associated |
| 22 | 21 | // non-talk article and pass that to the view. |
| — | — | @@ -731,9 +730,11 @@ |
| 732 | 731 | <form id="lqt_archive_search_form" action="{$this->title->getLocalURL()}"> |
| 733 | 732 | <input type="hidden" name="lqt_show_archive" value="1"> |
| 734 | 733 | <input type="hidden" name="title" value="{$this->title->getPrefixedURL()}" |
| 735 | | - <input type="radio" id="lqt_archive_filter_by_date_no" name="lqt_archive_filter_by_date" value="0" {$any_date_check}> |
| | 734 | + <input type="radio" id="lqt_archive_filter_by_date_no" |
| | 735 | + name="lqt_archive_filter_by_date" value="0" {$any_date_check}> |
| 736 | 736 | <label for="lqt_archive_filter_by_date_no">Any date</label> <br> |
| 737 | | - <input type="radio" id="lqt_archive_filter_by_date_yes" name="lqt_archive_filter_by_date" value="1" {$these_dates_check}> |
| | 737 | + <input type="radio" id="lqt_archive_filter_by_date_yes" |
| | 738 | + name="lqt_archive_filter_by_date" value="1" {$these_dates_check}> |
| 738 | 739 | <label for="lqt_archive_filter_by_date_yes">Only these dates:</label> <br> |
| 739 | 740 | |
| 740 | 741 | <label for="lqt_archive_start">Start</label> |
| Index: branches/liquidthreads/extensions/LqtModel.php |
| — | — | @@ -337,9 +337,8 @@ |
| 338 | 338 | function extendQuery( $original, $newname, $where, $options = array() ) { |
| 339 | 339 | if (!array_key_exists($original,$this->queries)) return; |
| 340 | 340 | $q = $this->queries[$original]; |
| 341 | | - $q[0] += $where; |
| 342 | | - $q[1] += $options; |
| 343 | | - $this->queries[$newname] = $q; |
| | 341 | + $this->queries[$newname] = array( array_merge($q[0], $where), |
| | 342 | + array_merge($q[1], $options) ); |
| 344 | 343 | } |
| 345 | 344 | |
| 346 | 345 | function deleteQuery( $name ) { |