Commit: f6909ab6e796a3bfb551314795a131720950b927 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revisión: f6909ab6e796a3bfb551314795a131720950b927 (tree)
• Tiempo: 2010-02-11 23:03:17
• Autor: gusagi <gusagi@704c...>
• Commiter: gusagi

Log Message

Fix Bug #2949716 - The value of start and limit might be not corresponding between Criteria and PageNavi.

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@436 704cf05f-ae62-4b0e-a484-234ee0250e75

Cambiar Resumen

• modified: docs/CHANGES.txt
• modified: html/modules/user/class/AbstractFilterForm.class.php

Diferencia incremental

--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,9 +7,12 @@ XOOPS Cube Legacy "Package_Legacy" & "XCube core" Changelog
 - Fix Bug #2806101 - References to JP.XOOPS.ORG (removed by XOOPS Foundation).
 - Fix Bug #2839172 - missing SSLLogin feature.
 - Fix Bug #2884127 - typos about regular expressions.
+- Fix Bug #2949716 - The value of start and limit might be not corresponding between Criteria and PageNavi.
 
 [Staff]
 - GIJOE
+- gusagi
+- halt
 - kilica
 - Marijuana
 - Mikhail

--- a/html/modules/user/class/AbstractFilterForm.class.php
+++ b/html/modules/user/class/AbstractFilterForm.class.php
@@ -59,8 +59,18 @@ class User_AbstractFilterForm
 
 	function getCriteria($start = null, $limit = null)
 	{
-		$t_start = ($start === null) ? $this->mNavi->getStart() : intval($start);
-		$t_limit = ($limit === null) ? $this->mNavi->getPerpage() : intval($limit);
+		if ($start === null) {
+			$t_start = $this->mNavi->getStart();
+		} else {
+			$t_start = intval($start);
+			$this->mNavi->setStart($t_start);
+		}
+		if ($limit === null) {
+			$t_limit = $this->mNavi->getPerpage();
+		} else {
+			$t_limit = intval($limit);
+			$this->mNavi->setPerpage($t_limit);
+		}
 		
 		$criteria = $this->_mCriteria;