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

Commit a9954cf

Browse files
pylebecqpylebecq
committed
RELEASE_1_3_5 => v1.3.5 commit
1 parent 9190128 commit a9954cf

File tree

182 files changed

+1187
-410
lines changed

Some content is hidden

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

182 files changed

+1187
-410
lines changed

‎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.3.4');
14+
define('SYMFONY_VERSION', '1.3.5');
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 29012 2010-04-06 19:17:09Z Kris.Wallsmith $
25+
* @version SVN: $Id: sfCoreAutoload.class.php 29705 2010-05-31 19:22:01Z Kris.Wallsmith $
2626
*/
2727
class sfCoreAutoload
2828
{

‎lib/cache/sfMemcacheCache.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage cache
1616
* @author Fabien Potencier <[email protected]>
17-
* @version SVN: $Id: sfMemcacheCache.class.php 24607 2009-11-30 21:39:08Z FabianLange $
17+
* @version SVN: $Id: sfMemcacheCache.class.php 29490 2010-05-17 13:09:00Z fabien $
1818
*/
1919
class sfMemcacheCache extends sfCache
2020
{
@@ -133,12 +133,12 @@ public function set($key, $data, $lifetime = null)
133133
public function remove($key)
134134
{
135135
// delete metadata
136-
$this->memcache->delete($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key);
136+
$this->memcache->delete($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, 0);
137137
if ($this->getOption('storeCacheInfo', false))
138138
{
139139
$this->setCacheInfo($key, true);
140140
}
141-
return $this->memcache->delete($this->getOption('prefix').$key);
141+
return $this->memcache->delete($this->getOption('prefix').$key, 0);
142142
}
143143

144144
/**

‎lib/config/sfApplicationConfiguration.class.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage config
1616
* @author Fabien Potencier <[email protected]>
17-
* @version SVN: $Id: sfApplicationConfiguration.class.php 24037 2009-11-16 17:35:09Z Kris.Wallsmith $
17+
* @version SVN: $Id: sfApplicationConfiguration.class.php 29526 2010-05-19 13:06:40Z fabien $
1818
*/
1919
abstract class sfApplicationConfiguration extends ProjectConfiguration
2020
{
@@ -234,6 +234,9 @@ public function checkLock()
234234
{
235235
if (is_readable($file))
236236
{
237+
header("HTTP/1.1 503 Service Temporarily Unavailable");
238+
header("Status: 503 Service Temporarily Unavailable");
239+
237240
include $file;
238241
break;
239242
}

‎lib/controller/sfController.class.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @subpackage controller
1717
* @author Fabien Potencier <[email protected]>
1818
* @author Sean Kerr <[email protected]>
19-
* @version SVN: $Id: sfController.class.php 29000 2010-04-06 17:53:15Z Kris.Wallsmith $
19+
* @version SVN: $Id: sfController.class.php 29523 2010-05-19 12:50:54Z fabien $
2020
*/
2121
abstract class sfController
2222
{
@@ -430,7 +430,7 @@ public function getPresentationFor($module, $action, $viewName = null)
430430

431431
try
432432
{
433-
// forward to the mail action
433+
// forward to the action
434434
$this->forward($module, $action);
435435
}
436436
catch (Exception $e)
@@ -450,7 +450,7 @@ public function getPresentationFor($module, $action, $viewName = null)
450450
// grab the action entry from this forward
451451
$actionEntry = $actionStack->getEntry($index);
452452

453-
// get raw email content
453+
// get raw content
454454
$presentation =& $actionEntry->getPresentation();
455455

456456
// put render mode back

‎lib/filter/sfExecutionFilter.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @subpackage filter
1818
* @author Fabien Potencier <[email protected]>
1919
* @author Sean Kerr <[email protected]>
20-
* @version SVN: $Id: sfExecutionFilter.class.php 24615 2009-11-30 22:30:46Z Kris.Wallsmith $
20+
* @version SVN: $Id: sfExecutionFilter.class.php 29523 2010-05-19 12:50:54Z fabien $
2121
*/
2222
class sfExecutionFilter extends sfFilter
2323
{
@@ -123,7 +123,7 @@ protected function handleView($filterChain, $actionInstance, $viewName)
123123
*
124124
* - sfView::NONE: Nothing happens.
125125
* - sfView::RENDER_CLIENT: View data populates the response content.
126-
* - sfView::RENDER_DATA: View data populates the data presentation variable.
126+
* - sfView::RENDER_VAR: View data populates the data presentation variable.
127127
*
128128
* @param string $moduleName The module name
129129
* @param string $actionName The action name

‎lib/filter/sfRenderingFilter.class.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @package symfony
1616
* @subpackage filter
1717
* @author Fabien Potencier <[email protected]>
18-
* @version SVN: $Id: sfRenderingFilter.class.php 11286 2008-09-02 10:27:36Z fabien $
18+
* @version SVN: $Id: sfRenderingFilter.class.php 29524 2010-05-19 12:55:30Z fabien $
1919
*/
2020
class sfRenderingFilter extends sfFilter
2121
{
@@ -46,6 +46,9 @@ public function execute($filterChain)
4646
}
4747

4848
// send headers + content
49-
$response->send();
49+
if (sfView::RENDER_VAR != $this->context->getController()->getRenderMode())
50+
{
51+
$response->send();
52+
}
5053
}
5154
}

‎lib/form/sfForm.class.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @package symfony
2424
* @subpackage form
2525
* @author Fabien Potencier <[email protected]>
26-
* @version SVN: $Id: sfForm.class.php 28996 2010-04-06 13:59:11Z Kris.Wallsmith $
26+
* @version SVN: $Id: sfForm.class.php 29678 2010-05-30 14:38:42Z Kris.Wallsmith $
2727
*/
2828
class sfForm implements ArrayAccess, Iterator, Countable
2929
{
@@ -334,13 +334,13 @@ public function getValue($field)
334334
/**
335335
* Returns the array name under which user data can retrieved.
336336
*
337-
* If the user data is not stored under an array, it returns null.
337+
* If the user data is not stored under an array, it returns false.
338338
*
339-
* @return string The name
339+
* @return string|boolean The name or false if the name format is not an array format
340340
*/
341341
public function getName()
342342
{
343-
if ('%s' == $nameFormat = $this->widgetSchema->getNameFormat())
343+
if ('[%s]' != substr($nameFormat = $this->widgetSchema->getNameFormat(), -4))
344344
{
345345
return false;
346346
}

‎lib/generator/sfModelGeneratorConfiguration.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @package symfony
77
* @subpackage generator
88
* @author Fabien Potencier <[email protected]>
9-
* @version SVN: $Id: sfModelGeneratorConfiguration.class.php 23900 2009-11-14 13:14:07Z bschussek $
9+
* @version SVN: $Id: sfModelGeneratorConfiguration.class.php 29656 2010-05-28 13:09:33Z Kris.Wallsmith $
1010
*/
1111
abstract class sfModelGeneratorConfiguration
1212
{

‎lib/helper/I18NHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @package symfony
1515
* @subpackage helper
1616
* @author Fabien Potencier <[email protected]>
17-
* @version SVN: $Id: I18NHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
17+
* @version SVN: $Id: I18NHelper.php 29597 2010-05-24 06:00:11Z fabien $
1818
*/
1919

2020
function __($text, $args = array(), $catalogue = 'messages')

‎lib/helper/TextHelper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @subpackage helper
1717
* @author Fabien Potencier <[email protected]>
1818
* @author David Heinemeier Hansson
19-
* @version SVN: $Id: TextHelper.php 24396 2009-11-25 19:13:19Z FabianLange $
19+
* @version SVN: $Id: TextHelper.php 29417 2010-05-12 06:53:36Z fabien $
2020
*/
2121

2222
/**
@@ -213,7 +213,7 @@ function auto_link_text($text, $link = 'all', $href_options = array(), $truncate
213213
*/
214214
function strip_links_text($text)
215215
{
216-
return preg_replace('/<a.*>(.*)<\/a>/m', '\\1', $text);
216+
return preg_replace('/<a[^>]*>(.*?)<\/a>/s', '\\1', $text);
217217
}
218218

219219
if (!defined('SF_AUTO_LINK_RE'))

0 commit comments

Comments
 (0)