[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.bocategories.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] admin/inc class.bocategories.inc.php |
Date: |
Tue, 19 Dec 2006 14:00:33 +0000 |
CVSROOT: /sources/phpgroupware
Module name: admin
Changes by: Dave Hall <skwashd> 06/12/19 14:00:33
Modified files:
inc : class.bocategories.inc.php
Log message:
fix conflict
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.bocategories.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
Patches:
Index: class.bocategories.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.bocategories.inc.php 27 Nov 2006 21:37:14 -0000 1.23
+++ class.bocategories.inc.php 19 Dec 2006 14:00:33 -0000 1.24
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.bocategories.inc.php,v 1.23 2006/11/27 21:37:14 sigurdne
Exp $ */
+ /* $Id: class.bocategories.inc.php,v 1.24 2006/12/19 14:00:33 skwashd
Exp $ */
/* $Source:
/sources/phpgroupware/admin/inc/class.bocategories.inc.php,v $ */
class bocategories
@@ -41,11 +41,11 @@
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
- $start = (isset($_REQUEST['start'])?(int)
$_REQUEST['start']:0);
- $query =
(isset($_REQUEST['query'])?$_REQUEST['query']:'');
- $sort =
(isset($_REQUEST['sort'])?$_REQUEST['sort']:'');
- $order =
(isset($_REQUEST['order'])?$_REQUEST['order']:'');
- $cat_id = (isset($_REQUEST['cat_id'])?(int)
$_REQUEST['cat_id']:'');
+ $start = isset($_REQUEST['start']) ? (int)
$_REQUEST['start'] : 0;
+ $query = isset($_REQUEST['query']) ?
$_REQUEST['query'] : '';
+ $sort = isset($_REQUEST['sort']) ?
$_REQUEST['sort'] : '';
+ $order = isset($_REQUEST['order']) ?
$_REQUEST['order'] : '';
+ $cat_id = isset($_REQUEST['cat_id'])? (int)
$_REQUEST['cat_id'] : 0;
if(!empty($start) || $start == 0)
{
@@ -149,6 +149,7 @@
function check_values($values)
{
+ $error = array();
if (strlen($values['descr']) >= 255)
{
$error[] = lang('Description can not exceed 255
characters in length !');
@@ -185,7 +186,8 @@
}
}
- if (isset($error) && is_array($error))
+ if ( is_array($error)
+ && count($error) )
{
return $error;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.bocategories.inc.php,
Dave Hall <=