Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit 23c29dd

Browse files
author
Pierre-Yves LEBECQ
committed
RELEASE_1_4_12 => v1.4.12 commit
1 parent 74817d9 commit 23c29dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+120
-67
lines changed

‎CHANGELOG

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
07/01/11: Version 1.4.12
2+
------------------------
3+
4+
* [32634] fixed typo in an error message (closes #9762 - based on a patch from garak)
5+
* [32635] fixed typo (closes #9682)
6+
* [32637] added missing translations for fr (patch from Garfield-fr - closes #9025)
7+
* [32638] added missing translations for de (patch from _GeG_ - closes #9659)
8+
* [32639] fixed typo (closes #9561, patch from Elvis_the_King)
9+
* [32641] fixed extra code in stack trace (closes #9511, patch from tomi)
10+
* [32652] fixed sfRoute, which was not serializing some parameters (closes #9833)
11+
* [32653] fixed possible PHP notice (closes #9813)
12+
* [32654] fixed standard actions in sfObjectRouteCollection (HEAD is equivalent to GET, closes #9669, patch from ganchiku)
13+
* [32677] fixed missing information about Swiftmailer version (closes #9838)
14+
* [32678] fixed sfNumberFormat::format() when the value has a negative exponent (closes #9836)
15+
116
03/30/11: Version 1.4.11
217
------------------------
318

‎lib/autoload/sfCoreAutoload.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* The current symfony version.
1313
*/
14-
define('SYMFONY_VERSION', '1.4.11');
14+
define('SYMFONY_VERSION', '1.4.12');
1515

1616
/**
1717
* sfCoreAutoload class.
@@ -22,7 +22,7 @@
2222
* @package symfony
2323
* @subpackage autoload
2424
* @author Fabien Potencier <[email protected]>
25-
* @version SVN: $Id: sfCoreAutoload.class.php 32410 2011-03-30 14:47:16Z Kris.Wallsmith
25+
* @version SVN: $Id: sfCoreAutoload.class.php 32415 2011-03-30 16:09:00Z Kris.Wallsmith
2626
$
2727
*/
2828
class sfCoreAutoload

‎lib/config/sfConfigCache.class.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @subpackage config
1919
* @author Fabien Potencier <[email protected]>
2020
* @author Sean Kerr <[email protected]>
21-
* @version SVN: $Id: sfConfigCache.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
21+
* @version SVN: $Id: sfConfigCache.class.php 32639 2011-06-11 13:28:46Z fabien $
2222
*/
2323
class sfConfigCache
2424
{
@@ -281,7 +281,7 @@ protected function loadConfigHandlers()
281281
// module level configuration handlers
282282

283283
// checks modules directory exists
284-
if (!is_readable($sf_app_modules_dir = sfConfig::get('sf_app_modules_dir')))
284+
if (!is_readable($sf_app_module_dir = sfConfig::get('sf_app_module_dir')))
285285
{
286286
return;
287287
}
@@ -290,7 +290,7 @@ protected function loadConfigHandlers()
290290
$ignore = array('.', '..', 'CVS', '.svn');
291291

292292
// create a file pointer to the module dir
293-
$fp = opendir($sf_app_modules_dir);
293+
$fp = opendir($sf_app_module_dir);
294294

295295
// loop through the directory and grab the modules
296296
while (($directory = readdir($fp)) !== false)
@@ -300,7 +300,7 @@ protected function loadConfigHandlers()
300300
continue;
301301
}
302302

303-
$configPath = $sf_app_modules_dir.'/'.$directory.'/config/config_handlers.yml';
303+
$configPath = $sf_app_module_dir.'/'.$directory.'/config/config_handlers.yml';
304304

305305
if (is_readable($configPath))
306306
{

‎lib/exception/sfException.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @subpackage exception
1919
* @author Fabien Potencier <[email protected]>
2020
* @author Sean Kerr <[email protected]>
21-
* @version SVN: $Id: sfException.class.php 23901 2009-11-14 13:33:03Z bschussek $
21+
* @version SVN: $Id: sfException.class.php 32641 2011-06-11 13:39:35Z fabien $
2222
*/
2323
class sfException extends Exception
2424
{
@@ -345,7 +345,7 @@ static protected function fileExcerpt($file, $line)
345345
{
346346
if (is_readable($file))
347347
{
348-
$content = preg_split('#<br />#', highlight_file($file, true));
348+
$content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
349349

350350
$lines = array();
351351
for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; $i++)

‎lib/i18n/sfNumberFormat.class.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* {@link http://prado.sourceforge.net/}
1414
*
1515
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
16-
* @version $Id: sfNumberFormat.class.php 28723 2010-03-23 16:37:43Z FabianLange $
16+
* @version $Id: sfNumberFormat.class.php 32678 2011-06-29 16:43:32Z fabien $
1717
* @package symfony
1818
* @subpackage i18n
1919
*/
@@ -86,7 +86,7 @@ function __construct($formatInfo = null)
8686
}
8787
else if ($formatInfo instanceof sfCultureInfo)
8888
{
89-
$this->formatInfo = $formatInfo->sfNumberFormat;
89+
$this->formatInfo = $formatInfo->getNumberFormat();
9090
}
9191
else if ($formatInfo instanceof sfNumberFormatInfo)
9292
{
@@ -329,8 +329,14 @@ protected function fixFloat($float)
329329

330330
list($significand, $exp) = explode('E', $string);
331331
list(, $decimal) = explode('.', $significand);
332-
$exp = str_replace('+', '', $exp) - strlen($decimal);
332+
if ('-' === $exp[0]) {
333+
$exp = str_replace('-', '', $exp);
333334

334-
return str_replace('.', '', $significand).str_repeat('0', $exp);
335+
return '0.'.str_repeat('0', $exp).str_replace('.', '', $significand);
336+
} else {
337+
$exp = str_replace('+', '', $exp) - strlen($decimal);
338+
339+
return str_replace('.', '', $significand).str_repeat('0', $exp);
340+
}
335341
}
336342
}

‎lib/plugins/sfDoctrinePlugin/i18n/sf_admin.de.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<target><![CDATA["%value%" ist kein Integer.]]></target>
164164
</trans-unit>
165165
<trans-unit>
166-
<source><![CDATA["%value%" is not an number.]]></source>
166+
<source><![CDATA["%value%" is not a number.]]></source>
167167
<target><![CDATA["%value%" ist keine Nummer.]]></target>
168168
</trans-unit>
169169
<trans-unit>
@@ -178,6 +178,14 @@
178178
<source><![CDATA[CSRF attack detected.]]></source>
179179
<target><![CDATA[CSRF Attacke erkannt.]]></target>
180180
</trans-unit>
181-
</body>
181+
<trans-unit>
182+
<source>Checked</source>
183+
<target>Ausgewählt</target>
184+
</trans-unit>
185+
<trans-unit>
186+
<source>Are you sure?</source>
187+
<target>Sind Sie sicher?</target>
188+
</trans-unit>
189+
</body>
182190
</file>
183191
</xliff>

‎lib/plugins/sfDoctrinePlugin/i18n/sf_admin.es.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
<target><![CDATA["%value%" no es un entero.]]></target>
275275
</trans-unit>
276276
<trans-unit>
277-
<source><![CDATA["%value%" is not an number.]]></source>
277+
<source><![CDATA["%value%" is not a number.]]></source>
278278
<target><![CDATA["%value%" no es un número.]]></target>
279279
</trans-unit>
280280
<trans-unit>

‎lib/plugins/sfDoctrinePlugin/i18n/sf_admin.fr.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@
8181
<source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
8282
<target>[0] aucun résultat|[1] 1 résultat|(1,+Inf] %1% résultats</target>
8383
</trans-unit>
84+
<trans-unit>
85+
<source>Are you sure?</source>
86+
<target>Etes-vous sûr?</target>
87+
</trans-unit>
88+
<trans-unit>
89+
<source>Checked</source>
90+
<target>Activé</target>
91+
</trans-unit>
8492

8593
<!-- Pagination -->
8694
<trans-unit>

‎lib/plugins/sfDoctrinePlugin/i18n/sf_admin.it.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<target><![CDATA["%value%" non è un intero.]]></target>
183183
</trans-unit>
184184
<trans-unit>
185-
<source><![CDATA["%value%" is not an number.]]></source>
185+
<source><![CDATA["%value%" is not a number.]]></source>
186186
<target><![CDATA["%value%" non è un numero.]]></target>
187187
</trans-unit>
188188
<trans-unit>

‎lib/plugins/sfDoctrinePlugin/i18n/sf_admin.ja.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<target>"%value%" は数値でありません。</target>
185185
</trans-unit>
186186
<trans-unit>
187-
<source>"%value%" is not an number.</source>
187+
<source>"%value%" is not a number.</source>
188188
<target>"%value%" は数字でありません。</target>
189189
</trans-unit>
190190
<trans-unit>

0 commit comments

Comments
 (0)