Author: sevein
Date: Mon Dec 5 17:14:37 2011
New Revision: 10367
Log:
Symfony changeset 32652 is not working so I removed it
Modified:
trunk/vendor/symfony/lib/routing/sfRoute.class.php
Modified: trunk/vendor/symfony/lib/routing/sfRoute.class.php
==============================================================================
--- trunk/vendor/symfony/lib/routing/sfRoute.class.php Mon Dec 5 16:35:52
2011 (r10366)
+++ trunk/vendor/symfony/lib/routing/sfRoute.class.php Mon Dec 5 17:14:37
2011 (r10367)
@@ -850,17 +850,20 @@
}
}
+ # Jesus: I could not merge this change, it is not working for some reasons.
+ # http://trac.symfony-project.org/changeset/32652
+
public function serialize()
{
// always serialize compiled routes
$this->compile();
// sfPatternRouting will always re-set defaultParameters, so no need to
serialize them
- return serialize(array($this->tokens, $this->defaultOptions,
$this->options, $this->pattern, $this->staticPrefix, $this->regex,
$this->variables, $this->defaults, $this->requirements, $this->suffix,
$this->customToken));
+ return serialize(array($this->tokens, $this->defaultOptions,
$this->options, $this->pattern, $this->staticPrefix, $this->regex,
$this->variables, $this->defaults, $this->requirements, $this->suffix,
$this->params));
}
public function unserialize($data)
{
- list($this->tokens, $this->defaultOptions, $this->options, $this->pattern,
$this->staticPrefix, $this->regex, $this->variables, $this->defaults,
$this->requirements, $this->suffix, $this->customToken) = unserialize($data);
+ list($this->tokens, $this->defaultOptions, $this->options, $this->pattern,
$this->staticPrefix, $this->regex, $this->variables, $this->defaults,
$this->requirements, $this->suffix, $this->params) = unserialize($data);
$this->compiled = true;
}
}
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" 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/qubit-commits?hl=en.
