adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/1.3' into merger

Browse source 
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/controller.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/pages/home.ctp
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/xml.test.php
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/View/Helper/TextHelper.php
	lib/Cake/View/Helper/TimeHelper.php
	lib/Cake/config/config.php
	lib/Cake/tests/Case/Cache/CacheTest.php
	lib/Cake/tests/Case/Model/CakeSchemaTest.php
	lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-04 01:10:23 -04:30
commit d83555cc52
22 changed files with 357 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/View/Helper/TextHelper.php
View file

@ -179,10 +179,10 @@ class TextHelper extends AppHelper {
$this->_linkOptions = $options;
$atom = '[a-z0-9!#$%&\'*+\/=?^_`{|}~-]';
return preg_replace_callback(
'/(' . $atom . '+(?:\.' . $atom . '+)*@[a-z0-9-]+(?:\.[a-z0-9-]+)*)/i',
'/(' . $atom . '+(?:\.' . $atom . '+)*@[a-z0-9-]+(?:\.[a-z0-9-]+)+)/i',
array(&$this, '_linkEmails'),
$text
);
);
}
/**