Changeset 6606
- Timestamp:
- 12/20/07 08:44:48 (1 year ago)
- Files:
-
- branches/1.1/lib/user/sfUser.class.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/user/sfUser.class.php
r5315 r6606 90 90 // - use the default culture set in i18n.yml 91 91 $currentCulture = $storage->read(self::CULTURE_NAMESPACE); 92 $this->setCulture($this-> parameterHolder->get('culture', !is_null($currentCulture) ? $currentCulture : $this->parameterHolder->get('default_culture', 'en')));92 $this->setCulture($this->getParameter('culture', !is_null($currentCulture) ? $currentCulture : $this->getParameter('default_culture', 'en'))); 93 93 94 94 // flag current flash to be removed at shutdown 95 if ($this-> parameterHolder->get('use_flash', false) && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash'))95 if ($this->getParameter('use_flash', false) && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash')) 96 96 { 97 97 if (sfConfig::get('sf_logging_enabled')) … … 131 131 public function setFlash($name, $value, $persist = true) 132 132 { 133 if (!$this-> parameterHolder->get('use_flash', false))133 if (!$this->getParameter('use_flash', false)) 134 134 { 135 135 return; … … 158 158 public function getFlash($name, $default = null) 159 159 { 160 if (!$this-> parameterHolder->get('use_flash', false))160 if (!$this->getParameter('use_flash', false)) 161 161 { 162 162 return $default; … … 175 175 public function hasFlash($name) 176 176 { 177 if (!$this-> parameterHolder->get('use_flash', false))177 if (!$this->getParameter('use_flash', false)) 178 178 { 179 179 return false; … … 241 241 { 242 242 // remove flash that are tagged to be removed 243 if ($this-> parameterHolder->get('use_flash', false) && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash/remove'))243 if ($this->getParameter('use_flash', false) && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash/remove')) 244 244 { 245 245 if (sfConfig::get('sf_logging_enabled'))