- Update to 1.2.2

Changes:	http://sourceforge.net/projects/phpldapadmin/files/phpldapadmin-php5/1.2.2/
PR:		ports/162065
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2011-10-27 17:01:43 +00:00
parent 6a5b96297b
commit 8c443d07e1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=284461
3 changed files with 3 additions and 18 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= phpldapadmin
PORTVERSION= 1.2.1.1
PORTREVISION= 1
PORTVERSION= 1.2.2
PORTEPOCH= 1
CATEGORIES= net www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION}

View file

@ -1,2 +1,2 @@
SHA256 (phpldapadmin-1.2.1.1.tgz) = 1fa6373c500a193a8868cb6a753f3b5218a92374b792994129c0c1b69d4d1090
SIZE (phpldapadmin-1.2.1.1.tgz) = 1468961
SHA256 (phpldapadmin-1.2.2.tgz) = 8629ea3f14630d4dd74099c997ac9795240a6417d5d124517ba5860c12d8a239
SIZE (phpldapadmin-1.2.2.tgz) = 1415565

View file

@ -1,14 +0,0 @@
--- ./lib/functions.php.orig 2011-05-11 05:40:18.000000000 -0400
+++ ./lib/functions.php 2011-10-24 09:00:11.000000000 -0400
@@ -1003,8 +1003,9 @@
if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
- # if the array to sort is null or empty
- if (! $data) return;
+ # if the array to sort is null or empty, or if we have some nasty chars
+ if (! preg_match('/^[a-zA-Z0-9_]+(\([a-zA-Z0-9_,]*\))?$/',$sortby) || ! $data)
+ return;
static $CACHE = array();