diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0' into 2.1

Browse Source 
* 2.0:
  [Form] Fixed "label" option to accept the value "0"
  [DomCrawler] lowered parsed protocol string (fixes #6986)

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
This commit is contained in:
Fabien Potencier 2013-02-23 07:41:44 +01:00
commit 22dbfc009f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DomCrawler/Link.php
View File

@ -46,7 +46,7 @@ class Link
*/
public function __construct(\DOMNode $node, $currentUri, $method = 'GET')
{
if (!in_array(substr($currentUri, 0, 4), array('http', 'file'))) {
if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
}