Merge "Warn against certain jQuery methods"
[lhc/web/wiklou.git] / includes / pager / RangeChronologicalPager.php
index 901d576..bf36983 100644 (file)
@@ -45,14 +45,12 @@ abstract class RangeChronologicalPager extends ReverseChronologicalPager {
                try {
                        if ( $startStamp !== '' ) {
                                $startTimestamp = MWTimestamp::getInstance( $startStamp );
-                               $startTimestamp->setTimezone( $this->getConfig()->get( 'Localtimezone' ) );
                                $startOffset = $this->mDb->timestamp( $startTimestamp->getTimestamp() );
                                $this->rangeConds[] = $this->mIndexField . '>=' . $this->mDb->addQuotes( $startOffset );
                        }
 
                        if ( $endStamp !== '' ) {
                                $endTimestamp = MWTimestamp::getInstance( $endStamp );
-                               $endTimestamp->setTimezone( $this->getConfig()->get( 'Localtimezone' ) );
                                $endOffset = $this->mDb->timestamp( $endTimestamp->getTimestamp() );
                                $this->rangeConds[] = $this->mIndexField . '<=' . $this->mDb->addQuotes( $endOffset );
 
@@ -99,13 +97,6 @@ abstract class RangeChronologicalPager extends ReverseChronologicalPager {
         * @return array
         */
        protected function buildQueryInfo( $offset, $limit, $descending ) {
-               if ( count( $this->rangeConds ) > 0 ) {
-                       // If range conditions are set, $offset is not used.
-                       // However, if range conditions aren't set, (such as when using paging links)
-                       // use the provided offset to get the proper query.
-                       $offset = '';
-               }
-
                list( $tables, $fields, $conds, $fname, $options, $join_conds ) = parent::buildQueryInfo(
                        $offset,
                        $limit,