RELEASE_1_4_7 => v1.4.7 commit

Author: pylebecq

CHANGELOG

@@ -1,3 +1,21 @@
+09/21/10: Version 1.4.7
+-----------------------
+
+ * [30951] fixed WDT injects multiple times (closes #9080)
+ * [30915] added support for "image/x-ms-bmp" mime type (closes #9069, patch from pbowyer)
+ * [30912] fixed view class overriding (closes #5097, patch from caefer)
+ * [30901] reverted remove of comments in Doctrine-generated table classes (closes #8880)
+ * [30900] fixed getUriPrefix() when requested is forwarded from a secure one (closes #4723)
+ * [30790] fixed logging of PHP errors to the WDT when error messages include a "%" character
+ * [30563] fixed sfWebController::redirect method does not respect HTTP specification (closes #8952, patch from rande)
+ * [30530] fixed path when a project is created on Windows and used on Linux (closes #8835)
+ * [30529] fixed Swift_PropelSpool when the message is stored in a GLOB column (closes #8869, #8558, patch from netounet)
+ * [30526] updated russian and ukrainian translation for the admin gen (closes #8814)
+ * [30445] added a check whether doctrine is already loaded to allow use of a compiled core (closes #8917, thanks gnukix)
+ * [30444] updated doctrine plugin to load Doctrine_Core rather than Doctrine
+ * [30442] changed remaining calls to `Doctrine` to `Doctrine_Core`
+ * [30441] Changed registration of Doctrine autoloader to use Doctrine_Core.
+
 06/29/10: Version 1.4.6
 -----------------------
 

data/bin/changelog.php

@@ -15,18 +15,20 @@
  *
  * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: changelog.php 24071 2009-11-17 07:36:21Z Kris.Wallsmith $
+ * @version    SVN: $Id: changelog.php 30952 2010-09-22 02:22:51Z Kris.Wallsmith $
  */
 require_once dirname(__FILE__).'/../../lib/task/sfFilesystem.class.php';
 
 if (!isset($argv[1]))
 {
-  throw new Exception('You must provide a revision range (-r123:456)');
+  echo "You must provide a revision range (-r123:456)\n";
+  exit(1);
 }
 
 if (!isset($argv[2]))
 {
-  throw new Exception('You must provide a repository path (/branches/1.3)');
+  echo "You must provide a repository path (/branches/1.4)\n";
+  exit(1);
 }
 
 $filesystem = new sfFilesystem();

lib/autoload/sfCoreAutoload.class.php

@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.4.6');
+define('SYMFONY_VERSION', '1.4.7');
 
 /**
  * sfCoreAutoload class.
@@ -22,7 +22,7 @@
  * @package    symfony
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCoreAutoload.class.php 30053 2010-06-29 17:06:07Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfCoreAutoload.class.php 30955 2010-09-22 02:35:27Z Kris.Wallsmith $
  */
 class sfCoreAutoload
 {

lib/controller/sfController.class.php

@@ -16,7 +16,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfController.class.php 29523 2010-05-19 12:50:54Z fabien $
+ * @version    SVN: $Id: sfController.class.php 30912 2010-09-15 11:10:46Z fabien $
  */
 abstract class sfController
 {
@@ -203,7 +203,12 @@ public function forward($moduleName, $actionName)
     $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'))

lib/controller/sfWebController.class.php

@@ -16,7 +16,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfWebController.class.php 28961 2010-04-01 14:17:52Z fabien $
+ * @version    SVN: $Id: sfWebController.class.php 30563 2010-08-06 11:22:44Z fabien $
  */
 abstract class sfWebController extends sfController
 {
@@ -193,7 +193,14 @@ public function redirect($url, $delay = 0, $statusCode = 302)
     $response = $this->context->getResponse();
     $response->clearHttpHeaders();
     $response->setStatusCode($statusCode);
-    $response->setHttpHeader('Location', $url);
+
+    // The Location header should only be used for status codes 201 and 3..
+    // For other code, only the refresh meta tag is used
+    if ($statusCode == 201 || ($statusCode >= 300 && $statusCode < 400))
+    {
+      $response->setHttpHeader('Location', $url);
+    }
+
     $response->setContent(sprintf('<html><head><meta http-equiv="refresh" content="%d;url=%s"/></head></html>', $delay, htmlspecialchars($url, ENT_QUOTES, sfConfig::get('sf_charset'))));
     $response->send();
   }

lib/debug/sfWebDebug.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebug.class.php 27284 2010-01-28 18:34:57Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfWebDebug.class.php 30951 2010-09-22 02:17:27Z Kris.Wallsmith $
  */
 class sfWebDebug
 {
@@ -154,15 +154,21 @@ public function getOption($name, $default = null)
    */
   public function injectToolbar($content)
   {
-    $content = str_ireplace('</head>', '<style type="text/css">'.str_replace(array("\r", "\n"), ' ', $this->getStylesheet()).'</style></head>', $content);
+    if (false !== $pos = stripos($content, '</head>'))
+    {
+      $styles = '<style type="text/css">'.str_replace(array("\r", "\n"), ' ', $this->getStylesheet()).'</style>';
+      $content = substr($content, 0, $pos).$styles.substr($content, $pos);
+    }
 
     $debug = $this->asHtml();
-    $count = 0;
-    $content = str_ireplace('</body>', '<script type="text/javascript">'.$this->getJavascript().'</script>'.$debug.'</body>', $content, $count);
-    if (!$count)
+    if (false === $pos = strripos($content, '</body>'))
     {
       $content .= $debug;
     }
+    else
+    {
+      $content = substr($content, 0, $pos).$debug.substr($content, $pos);
+    }
 
     return $content;
   }

lib/log/sfWebDebugLogger.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugLogger.class.php 22853 2009-10-07 12:11:15Z fabien $
+ * @version    SVN: $Id: sfWebDebugLogger.class.php 30790 2010-08-31 13:23:50Z Kris.Wallsmith $
  */
 class sfWebDebugLogger extends sfVarLogger
 {
@@ -82,7 +82,7 @@ public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext
       return false;
     }
 
-    $message = sprintf(' %%s at %s on line %s (%s)', $errfile, $errline, $errstr);
+    $message = sprintf(' %%s at %s on line %s (%s)', $errfile, $errline, str_replace('%', '%%', $errstr));
     switch ($errno)
     {
       case E_STRICT:

lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrinePluginConfiguration.class.php 29156 2010-04-14 22:22:41Z bschussek $
+ * @version    SVN: $Id: sfDoctrinePluginConfiguration.class.php 30445 2010-07-28 04:37:32Z Kris.Wallsmith $
  */
 class sfDoctrinePluginConfiguration extends sfPluginConfiguration
 {
@@ -37,15 +37,18 @@ public function initialize()
       $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelDoctrine', 'listenToAddPanelEvent'));
     }
 
-    require_once sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine')).'/Doctrine.php';
-    spl_autoload_register(array('Doctrine', 'autoload'));
+    if (!class_exists('Doctrine_Core', false))
+    {
+      require_once sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine')).'/Doctrine/Core.php';
+    }
+    spl_autoload_register(array('Doctrine_Core', 'autoload'));
 
     $manager = Doctrine_Manager::getInstance();
-    $manager->setAttribute(Doctrine::ATTR_EXPORT, Doctrine::EXPORT_ALL);
-    $manager->setAttribute(Doctrine::ATTR_VALIDATE, Doctrine::VALIDATE_NONE);
-    $manager->setAttribute(Doctrine::ATTR_RECURSIVE_MERGE_FIXTURES, true);
-    $manager->setAttribute(Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
-    $manager->setAttribute(Doctrine::ATTR_AUTOLOAD_TABLE_CLASSES, true);
+    $manager->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
+    $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    $manager->setAttribute(Doctrine_Core::ATTR_RECURSIVE_MERGE_FIXTURES, true);
+    $manager->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+    $manager->setAttribute(Doctrine_Core::ATTR_AUTOLOAD_TABLE_CLASSES, true);
 
     // apply default attributes
     $manager->setDefaultAttributes();

lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/paginationAction.php

@@ -31,12 +31,12 @@ protected function buildQuery()
 
     $query = $this->filters->buildQuery($this->getFilters());
 <?php else: ?>
-    $query = Doctrine::getTable('<?php echo $this->getModelClass() ?>')
+    $query = Doctrine_Core::getTable('<?php echo $this->getModelClass() ?>')
       ->createQuery('a');
 
     if ($tableMethod)
     {
-      $query = Doctrine::getTable('<?php echo $this->getModelClass() ?>')->$tableMethod($query);
+      $query = Doctrine_Core::getTable('<?php echo $this->getModelClass() ?>')->$tableMethod($query);
     }
 <?php endif; ?>
 

lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/sortingAction.php

@@ -37,5 +37,5 @@ protected function setSort(array $sort)
 
   protected function isValidSortColumn($column)
   {
-    return Doctrine::getTable('<?php echo $this->getModelClass() ?>')->hasColumn($column);
+    return Doctrine_Core::getTable('<?php echo $this->getModelClass() ?>')->hasColumn($column);
   }