cvs: pear /Net_IPv6 IPv6.php

alexmerz Thu Feb 9 15:13:06 2006 UTC Modified files: /pear/Net_IPv6 IPv6.php Log: test ip for netmask before removing http://cvs.php.net/viewcvs.cgi/pear/Net_IPv6/IPv6.php?r1=1.13&r2=1.14&diff_format=u Index: pear/Net_IPv6/IPv6.php diff -u pear/Net_IPv6/IPv6.php:1.13 pear/Net_IPv6/IPv6.php:1.14 --- pear/Net_IPv6/IPv6.php:1.13 Thu Nov 24 15:03:42 2005 +++ pear/Net_IPv6/IPv6.php Thu Feb 9 15:13:06 2006 @@ -18,7 +18,7 @@ * @author Alexander Merz <alexander.merz@web.de> * @copyright 2003-2005 The PHP Group * @license http://www.opensource.org/licenses/bsd-license.php - * @version CVS: $Id: IPv6.php,v 1.13 2005/11/24 15:03:42 alexmerz Exp $ + * @version CVS: $Id: IPv6.php,v 1.14 2006/02/09 15:13:06 alexmerz Exp $ * @link http://pear.php.net/package/Net_IPv6 */ @@ -107,7 +107,7 @@ * @author Alexander Merz <alexander.merz@web.de> * @copyright 2003-2005 The PHP Group * @license http://www.opensource.org/licenses/bsd-license.php - * @version CVS: $Id: IPv6.php,v 1.13 2005/11/24 15:03:42 alexmerz Exp $ + * @version CVS: $Id: IPv6.php,v 1.14 2006/02/09 15:13:06 alexmerz Exp $ * @link http://pear.php.net/package/Net_IPv6 * @author elfrink at introweb dot nl * @author Josh Peck <jmp at joshpeck dot org> @@ -126,7 +126,11 @@ * @static */ function removeNetmaskSpec($ip) { - list($addr, $nm) = explode('/', $ip); + if(false !== strpos($ip, '/')) { + list($addr, $nm) = explode('/', $ip); + } else { + $addr = $ip; + } return $addr; }