cvs: pear /Net_URL URL.php

davidc Fri May 11 01:55:53 2007 UTC

Modified files:
/pear/Net_URL URL.php
Log:
- Bug 11008 Patch by http://pear.php.net/user/spaze


http://cvs.php.net/viewvc.cgi/pear/N...&diff_format=u
Index: pear/Net_URL/URL.php
diff -u pear/Net_URL/URL.php:1.46 pear/Net_URL/URL.php:1.47
--- pear/Net_URL/URL.php:1.46 Tue May 8 05:01:49 2007
+++ pear/Net_URL/URL.php Fri May 11 01:55:53 2007
@@ -32,7 +32,7 @@
// | Author: Richard Heyes <richard at php net> |
// +-----------------------------------------------------------------------+
//
-// $Id: URL.php,v 1.46 2007/05/08 05:01:49 davidc Exp $
+// $Id: URL.php,v 1.47 2007/05/11 01:55:53 davidc Exp $
//
// Net_URL Class

@@ -129,12 +129,10 @@
$this->initialize();
}

- function initialize($url = null, $useBrackets = true)
+ function initialize()
{
$HTTP_SERVER_VARS = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];

- $this->useBrackets = $useBrackets;
- $this->url = $url;
$this->user = '';
$this->pass = '';
$this->host = '';
@@ -144,7 +142,7 @@
$this->anchor = '';

// Only use defaults if not an absolute URL given
- if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
+ if (!preg_match('/^[a-z0-9]+:\/\//i', $this->url)) {
$this->protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https' : 'http');

/**
@@ -169,8 +167,8 @@
}

// Parse the url and store the various parts
- if (!empty($url)) {
- $urlinfo = parse_url($url);
+ if (!empty($this->url)) {
+ $urlinfo = parse_url($this->url);

// Default querystring
$this->querystring = array();