Merge branch 'master' into fix-link-to-github-pipeline-badge

FriendsOfSymfony1 · Jan 18, 2024 · 2a15114 · 2a15114
2 parents 424ed4d + b88d698
commit 2a15114
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/config/sfCacheConfigHandler.class.php b/lib/config/sfCacheConfigHandler.class.php
@@ -92,7 +92,7 @@ protected function addCache($actionName = '')
         $lifeTime = !$enabled ? '0' : $this->getConfigValue('lifetime', $actionName, '0');
 
         // client_lifetime
-        $clientLifetime = !$enabled ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime, '0');
+        $clientLifetime = !$enabled ? '0' : $this->getConfigValue('client_lifetime', $actionName, $lifeTime);
 
         // contextual
         $contextual = $this->getConfigValue('contextual', $actionName) ? 'true' : 'false';

diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
@@ -47,7 +47,7 @@ class sfForm implements ArrayAccess, Iterator, Countable
     protected $isBound = false;
     protected $taintedValues = array();
     protected $taintedFiles = array();
-    protected $values;
+    protected $values = array();
     protected $defaults = array();
     protected $fieldNames = array();
     protected $options = array();