Changeset 2588

Timestamp:

06/17/08 07:00:45 (17 months ago)

Author:

takayama

Message:

Fixed BugId:80146
* Applied patch

Files:

• branches/release-40/php/lib/mtdb_base.php (modified) (2 diffs)

branches/release-40/php/lib/mtdb_base.php

@@ -493 +493 @@
             $args['lastn'] = $args['limit'];
         } elseif (!isset($args['days']) && !isset($args['lastn'])) {
-        #    if ($days = $blog['blog_days_on_index']) {
-        #        if (!isset($args['recently_commented_on'])) {
-        #            $args['days'] = $days;
-        #        }
-        #    } elseif ($posts = $blog['blog_entries_on_index']) {
-        #        $args['lastn'] = $posts;
-        #    }
+            if ($days = $blog['blog_days_on_index']) {
+                if (!isset($args['recently_commented_on'])) {
+                    $args['days'] = $days;
+                }
+            } elseif ($posts = $blog['blog_entries_on_index']) {
+                $args['lastn'] = $posts;
+            }
         }
         if ($args['limit'] == 'auto') {
@@ -898 +898 @@
             $no_resort = 1;
         } elseif ( !is_null($total_count) ) {
-            $orig_limit = $limit;
-            $orig_offset = $offset;
+            $orig_offset = $post_select_offset ? $post_select_offset : $orig_offset;
+            $orig_limit = $post_select_limit ? $post_select_limit : $limit;
         } else {
             $sql = $this->apply_limit_sql($sql . " <LIMIT>", $limit, $offset);