Author: FabianLange
Date: 2010-02-05 17:37:22 +0100 (Fri, 05 Feb 2010)
New Revision: 27597
Modified:
branches/1.2/lib/helper/UrlHelper.php
branches/1.3/lib/helper/UrlHelper.php
branches/1.4/lib/helper/UrlHelper.php
Log:
[1.2, 1.3, 1.4] fixed minor incompatibility of new link_to() behaviour with 1.0
behaviour (fixes #7933, #8231)
Modified: branches/1.2/lib/helper/UrlHelper.php
===================================================================
--- branches/1.2/lib/helper/UrlHelper.php 2010-02-05 15:12:48 UTC (rev
27596)
+++ branches/1.2/lib/helper/UrlHelper.php 2010-02-05 16:37:22 UTC (rev
27597)
@@ -163,7 +163,7 @@
{
// for BC with 1.1
$arguments = func_get_args();
- if (empty($arguments[1]) || '@' == substr($arguments[1], 0, 1) || false !==
strpos($arguments[1], '/'))
+ if (empty($arguments[1]) || is_array($arguments[1]) || '@' ==
substr($arguments[1], 0, 1) || false !== strpos($arguments[1], '/'))
{
return call_user_func_array('link_to1', $arguments);
}
Modified: branches/1.3/lib/helper/UrlHelper.php
===================================================================
--- branches/1.3/lib/helper/UrlHelper.php 2010-02-05 15:12:48 UTC (rev
27596)
+++ branches/1.3/lib/helper/UrlHelper.php 2010-02-05 16:37:22 UTC (rev
27597)
@@ -163,7 +163,7 @@
{
// for BC with 1.1
$arguments = func_get_args();
- if (empty($arguments[1]) || '@' == substr($arguments[1], 0, 1) || false !==
strpos($arguments[1], '/'))
+ if (empty($arguments[1]) || is_array($arguments[1]) || '@' ==
substr($arguments[1], 0, 1) || false !== strpos($arguments[1], '/'))
{
return call_user_func_array('link_to1', $arguments);
}
Modified: branches/1.4/lib/helper/UrlHelper.php
===================================================================
--- branches/1.4/lib/helper/UrlHelper.php 2010-02-05 15:12:48 UTC (rev
27596)
+++ branches/1.4/lib/helper/UrlHelper.php 2010-02-05 16:37:22 UTC (rev
27597)
@@ -110,7 +110,7 @@
{
// for BC with 1.1
$arguments = func_get_args();
- if (is_array($arguments[0]) || '@' == substr($arguments[0], 0, 1) || false
!== strpos($arguments[0], '/'))
+ if (is_array($arguments[0]) || is_array($arguments[1]) || '@' ==
substr($arguments[0], 0, 1) || false !== strpos($arguments[0], '/'))
{
return call_user_func_array('url_for1', $arguments);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
