Changeset 2454

Timestamp:

05/28/08 10:32:31 (21 months ago)

Author:

fumiakiy

Message:

Calculate and set offset value correctly when the number of items appearing on a page is changed. BugId:79897

Location:

branches/release-39/lib/MT/CMS

Files:

• Entry.pm (modified) (1 diff)
• Tag.pm (modified) (1 diff)
• TrackBack.pm (modified) (1 diff)

branches/release-39/lib/MT/CMS/Entry.pm

@@ -559 +559 @@
     $arg{direction} = 'descend';
     $arg{limit}     = $limit + 1;
-    if ( $total && $offset > $total - 1 ) {
+    if ( $total <= $limit ) {
+        delete $arg{limit};
+        $offset = 0;
+    }
+    elsif ( $total && $offset > $total - 1 ) {
         $arg{offset} = $offset = $total - $limit;
     }
     elsif ( $offset && ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) ) {
-        $arg{offset} = $offset = 0;
+        $arg{offset} = $offset = $total - $limit;
     }
     else {

branches/release-39/lib/MT/CMS/Tag.pm

@@ -387 +387 @@
     $arg{'sort'} = 'name';
     $arg{limit} = $limit + 1;
-    if ( $total && $offset > $total - 1 ) {
+    if ( $total <= $limit ) {
+        delete $arg{limit};
+        $offset = 0;
+    }
+    elsif ( $total && $offset > $total - 1 ) {
         $arg{offset} = $offset = $total - $limit;
     }

branches/release-39/lib/MT/CMS/TrackBack.pm

@@ -245 +245 @@
     $arg{direction} = $sort_direction;
     $arg{limit}     = $limit + 1;
-    if ( $total && $offset > $total - 1 ) {
+    if ( $total <= $limit ) {
+        delete $arg{limit};
+        $offset = 0;
+    }
+    elsif ( $total && $offset > $total - 1 ) {
         $arg{offset} = $offset = $total - $limit;
     }
     elsif ( $offset && ( ( $offset < 0 ) || ( $total - $offset < $limit ) ) ) {
-        $arg{offset} = $offset = 0;
-    }
-    elsif ($offset) {
-        $arg{offset} = $offset;
+        $arg{offset} = $offset = $total - $limit;
+    }
+    else {
+        $arg{offset} = $offset if $offset;
     }