Author: fabien
Date: 2010-09-15 13:10:46 +0200 (Wed, 15 Sep 2010)
New Revision: 30912
Modified:
branches/1.3/lib/controller/sfController.class.php
branches/1.4/lib/controller/sfController.class.php
branches/1.4/lib/task/sfFilesystem.class.php
Log:
[1.3, 1.4] fixed view class overriding (closes #5097, patch from caefer)
Modified: branches/1.3/lib/controller/sfController.class.php
===================================================================
--- branches/1.3/lib/controller/sfController.class.php 2010-09-15 09:37:44 UTC
(rev 30911)
+++ branches/1.3/lib/controller/sfController.class.php 2010-09-15 11:10:46 UTC
(rev 30912)
@@ -203,7 +203,12 @@
$this->getActionStack()->addEntry($moduleName, $actionName,
$actionInstance);
// include module configuration
+ $viewClass = sfConfig::get('mod_'.strtolower($moduleName).'_view_class',
false);
require($this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+ if (false !== $viewClass)
+ {
+ sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
+ }
// check if this module is internal
if ($this->getActionStack()->getSize() == 1 &&
sfConfig::get('mod_'.strtolower($moduleName).'_is_internal') &&
!sfConfig::get('sf_test'))
Modified: branches/1.4/lib/controller/sfController.class.php
===================================================================
--- branches/1.4/lib/controller/sfController.class.php 2010-09-15 09:37:44 UTC
(rev 30911)
+++ branches/1.4/lib/controller/sfController.class.php 2010-09-15 11:10:46 UTC
(rev 30912)
@@ -203,7 +203,12 @@
$this->getActionStack()->addEntry($moduleName, $actionName,
$actionInstance);
// include module configuration
+ $viewClass = sfConfig::get('mod_'.strtolower($moduleName).'_view_class',
false);
require($this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+ if (false !== $viewClass)
+ {
+ sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
+ }
// module enabled?
if (sfConfig::get('mod_'.strtolower($moduleName).'_enabled'))
Modified: branches/1.4/lib/task/sfFilesystem.class.php
===================================================================
--- branches/1.4/lib/task/sfFilesystem.class.php 2010-09-15 09:37:44 UTC
(rev 30911)
+++ branches/1.4/lib/task/sfFilesystem.class.php 2010-09-15 11:10:46 UTC
(rev 30912)
@@ -302,7 +302,7 @@
$output = '';
$err = '';
- while (!feof($pipes[1]))
+ while (!feof($pipes[1]) || !feof($pipes[2]))
{
foreach ($pipes as $key => $pipe)
{
--
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.
