TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor services

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Model/Country.php
	modifié:         core/lib/Thelia/Model/Currency.php
	modifié:         core/lib/Thelia/Tools/URL.php
This commit is contained in:
Benjamin Perche
2014-07-10 11:19:49 +02:00
parent 658c848171
commit 7727c14440
2 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Tools/URL.php
View File

@@ -315,15 +315,7 @@ class URL
$clean;
}
<<<<<<< HEAD
<<<<<<< HEAD
public static function checkUrl($url, array $protocols = ["http", "https"])
=======
public function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Define archive builders and formatters
=======
public static function checkUrl($url, array $protocols = ["http", "https"])
>>>>>>> Fix FileDownloader test
{
$pattern = sprintf(UrlValidator::PATTERN, implode('|', $protocols));