Changeset 29521
- Timestamp:
- 05/19/10 13:47:56 (3 years ago)
- Files:
-
- branches/1.3/lib/util/sfDomCssSelector.class.php (modified) (1 diff)
- branches/1.3/lib/util/sfNamespacedParameterHolder.class.php (modified) (1 diff)
- branches/1.3/lib/view/sfViewCacheManager.class.php (modified) (1 diff)
- branches/1.3/test/unit/i18n/sfMessageSource_XLIFFTest.php (modified) (1 diff)
- branches/1.4/lib/util/sfDomCssSelector.class.php (modified) (1 diff)
- branches/1.4/lib/util/sfNamespacedParameterHolder.class.php (modified) (1 diff)
- branches/1.4/lib/view/sfViewCacheManager.class.php (modified) (1 diff)
- branches/1.4/test/unit/i18n/sfMessageSource_XLIFFTest.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.3/lib/util/sfDomCssSelector.class.php
r29158 r29521 199 199 $attrName = $match[1]; 200 200 $attrOperator = $match[2]; 201 $attrValue = $match[4] === '' ? $match[5]: $match[4];201 $attrValue = $match[4] === '' ? (isset($match[5]) ? $match[5] : '') : $match[4]; 202 202 203 203 switch ($attrOperator) branches/1.3/lib/util/sfNamespacedParameterHolder.class.php
r9051 r29521 53 53 if ($move) 54 54 { 55 $values = $this->removeNamespace(); 56 $this->addByRef($values, $namespace); 55 if (null !== $values = $this->removeNamespace()) 56 { 57 $this->addByRef($values, $namespace); 58 } 57 59 } 58 60 branches/1.3/lib/view/sfViewCacheManager.class.php
r28785 r29521 386 386 list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri); 387 387 388 if (!isset($params['module'])) 389 { 390 return $defaultValue; 391 } 392 388 393 $this->registerConfiguration($params['module']); 389 394 branches/1.3/test/unit/i18n/sfMessageSource_XLIFFTest.php
r19777 r29521 20 20 // copy fixtures to tmp directory 21 21 copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml'); 22 copy(dirname(__FILE__).'/fixtures/invalid.xml', $temp.'/invalid.xml');23 22 24 23 $source = sfMessageSource::factory('XLIFF', $temp); branches/1.4/lib/util/sfDomCssSelector.class.php
r29158 r29521 186 186 $attrName = $match[1]; 187 187 $attrOperator = $match[2]; 188 $attrValue = $match[4] === '' ? $match[5]: $match[4];188 $attrValue = $match[4] === '' ? (isset($match[5]) ? $match[5] : '') : $match[4]; 189 189 190 190 switch ($attrOperator) branches/1.4/lib/util/sfNamespacedParameterHolder.class.php
r23922 r29521 53 53 if ($move) 54 54 { 55 $values = $this->removeNamespace(); 56 $this->addByRef($values, $namespace); 55 if (null !== $values = $this->removeNamespace()) 56 { 57 $this->addByRef($values, $namespace); 58 } 57 59 } 58 60 branches/1.4/lib/view/sfViewCacheManager.class.php
r28785 r29521 386 386 list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri); 387 387 388 if (!isset($params['module'])) 389 { 390 return $defaultValue; 391 } 392 388 393 $this->registerConfiguration($params['module']); 389 394 branches/1.4/test/unit/i18n/sfMessageSource_XLIFFTest.php
r19777 r29521 20 20 // copy fixtures to tmp directory 21 21 copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml'); 22 copy(dirname(__FILE__).'/fixtures/invalid.xml', $temp.'/invalid.xml');23 22 24 23 $source = sfMessageSource::factory('XLIFF', $temp);
