RELEASE_1_4_14 => v1.4.14 commit

Author: Pierre-Yves LEBECQ

CHANGELOG

@@ -1,3 +1,14 @@
+09/16/11: Version 1.4.14
+------------------------
+
+ * [33025] fixed sfCacheSessionStorage does not always check whether HTTP_USER_AGENT is set (closes #9921, patch from boutell)
+ * [33022] fixed auto_link_text() when an email address is already linked (closes #9915, based on a patch from klemens_u)
+ * [33021] fixed sfCacheSessionStorage does not serialize properly, also uses wrong option name for httponly (closes #9919, based on a patch from boutell)
+ * [32939] fixed memory leak in sfRoute::generate() (closes #9886 - patch from acf0)
+ * [32892] fixed Doctrine form generation when a schema has abstract tables (closes #9885 - patch from chok)
+ * [32891] fixed sfFinder bug when mirroring file with twice the path inside it (closes #9892 - based on a patch from shordeaux)
+ * [32890] fixed bad value of property 'list-style' in css of WebDebug toolbar (closes #9891 - patch from tomi)
+
 08/05/11: Version 1.4.13
 ------------------------
 

lib/autoload/sfCoreAutoload.class.php

@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.4.13');
+define('SYMFONY_VERSION', '1.4.14');
 
 /**
  * sfCoreAutoload class.

lib/debug/sfWebDebug.class.php

@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <[email protected]>
- * @version    SVN: $Id: sfWebDebug.class.php 31254 2010-10-26 15:26:03Z fabien $
+ * @version    SVN: $Id: sfWebDebug.class.php 32890 2011-08-05 07:44:44Z fabien $
  */
 class sfWebDebug
 {
@@ -780,7 +780,7 @@ public function getStylesheet()
   margin: 0;
   padding: 0;
   margin-left: 20px;
-  list-style: number;
+  list-style: decimal;
 }
 
 #sfWebDebugDatabaseLogs li

lib/helper/TextHelper.php

@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <[email protected]>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: TextHelper.php 31895 2011-01-24 18:37:43Z fabien $
+ * @version    SVN: $Id: TextHelper.php 33022 2011-09-15 05:27:12Z fabien $
  */
 
 /**
@@ -283,5 +283,10 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru
  */
 function _auto_link_email_addresses($text)
 {
-  return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
+  // Taken from http://snippets.dzone.com/posts/show/6156
+  return preg_replace("#(^|[\n ])([a-z0-9&\-_\.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $text);
+
+  // Removed since it destroys already linked emails 
+  // Example:   <a href="mailto:[email protected]">bar</a> gets <a href="mailto:[email protected]">bar</a> gets <a href="mailto:<a href="mailto:[email protected]">bar</a>
+  //return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
 }

lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -18,7 +18,7 @@
  * @subpackage generator
  * @author     Fabien Potencier <[email protected]>
  * @author     Jonathan H. Wage <[email protected]>
- * @version    SVN: $Id: sfDoctrineFormGenerator.class.php 29661 2010-05-28 16:56:42Z Kris.Wallsmith $
+ * @version    SVN: $Id: sfDoctrineFormGenerator.class.php 32892 2011-08-05 07:53:57Z fabien $
  */
 class sfDoctrineFormGenerator extends sfGenerator
 {
@@ -167,10 +167,14 @@ public function getPluginModels()
             if ($reflection->isSubClassOf($parent))
             {
               $this->pluginModels[$modelName] = $pluginName;
-              $generators = Doctrine_Core::getTable($modelName)->getGenerators();
-              foreach ($generators as $generator)
+              
+              if ($reflection->isInstantiable())
               {
-                $this->pluginModels[$generator->getOption('className')] = $pluginName;
+                $generators = Doctrine_Core::getTable($modelName)->getGenerators();
+                foreach ($generators as $generator)
+                {
+                  $this->pluginModels[$generator->getOption('className')] = $pluginName;
+                }  
               }
             }
           }

lib/plugins/sfPropelPlugin/test/functional/fixtures/data/database.sqlite

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Aug  5 09:39:36 2011
+ * Fri Sep 16 11:31:31 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/ArticleTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Aug  5 09:39:39 2011
+ * Fri Sep 16 11:31:32 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/AttachmentTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Aug  5 09:39:37 2011
+ * Fri Sep 16 11:31:32 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.

lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/map/AuthorArticleTableMap.php

@@ -7,7 +7,7 @@
  *
  * This class was autogenerated by Propel 1.4.2 on:
  *
- * Fri Aug  5 09:39:37 2011
+ * Fri Sep 16 11:31:31 2011
  *
  *
  * This map class is used by Propel to do runtime db structure discovery.