From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/lib/classes/listform.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 197c406..ef3a52f 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -199,9 +199,10 @@
$_SESSION['search']['limit'] = $app->functions->intval($_POST['search_limit']);
}
- if(preg_match('{^[0-9]$}',$_SESSION['search']['limit'])){
- $_SESSION['search']['limit'] = 15;
- }
+ //if(preg_match('{^[0-9]$}',$_SESSION['search']['limit'])){
+ // $_SESSION['search']['limit'] = 15;
+ //}
+ if(intval($_SESSION['search']['limit']) < 1) $_SESSION['search']['limit'] = 15;
//* Get Config variables
$list_name = $this->listDef['name'];
--
Gitblit v1.9.1