Changeset 2589

Timestamp:

06/17/08 09:07:28 (17 months ago)

Author:

takayama

Message:

Fixed BugId:80146
* Applied patch (again..)

Files:

• branches/release-40/php/lib/mtdb_base.php (modified) (1 diff)

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') {
             if (($_REQUEST['limit'] > 0) && ($_REQUEST['limit'] < $args['lastn'])) {
                 $args['lastn'] = intval($_REQUEST['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;
+                }            
             }
         }