Changeset 10973
- Timestamp:
- 08/19/08 22:49:14 (2 years ago)
- Files:
-
- branches/dwhittle/1.0/lib/log/sfLogger/sfFileLogger.class.php (modified) (1 diff)
- branches/dwhittle/1.1/lib/cache/sfNoCache.class.php (modified) (1 diff)
- branches/dwhittle/1.1/lib/log/sfFileLogger.class.php (modified) (1 diff)
- branches/dwhittle/1.2/lib/cache/sfNoCache.class.php (modified) (1 diff)
- branches/dwhittle/1.2/lib/log/sfFileLogger.class.php (modified) (1 diff)
- branches/dwhittle/1.2/lib/routing/sfPatternRouting.class.php (modified) (2 diffs)
- branches/dwhittle/1.2/lib/util/sfInflector.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/dwhittle/1.0/lib/log/sfLogger/sfFileLogger.class.php
r6598 r10973 74 74 public function shutdown() 75 75 { 76 if ( $this->fp)76 if (is_resource($this->fp)) 77 77 { 78 78 fclose($this->fp); branches/dwhittle/1.1/lib/cache/sfNoCache.class.php
r4599 r10973 24 24 public function get($key, $default = null) 25 25 { 26 return null;26 return $default; 27 27 } 28 28 branches/dwhittle/1.1/lib/log/sfFileLogger.class.php
r9088 r10973 120 120 public function shutdown() 121 121 { 122 if ( $this->fp)122 if (is_resource($this->fp)) 123 123 { 124 124 fclose($this->fp); branches/dwhittle/1.2/lib/cache/sfNoCache.class.php
r7605 r10973 24 24 public function get($key, $default = null) 25 25 { 26 return null;26 return $default; 27 27 } 28 28 branches/dwhittle/1.2/lib/log/sfFileLogger.class.php
r9081 r10973 121 121 public function shutdown() 122 122 { 123 if ( $this->fp)123 if (is_resource($this->fp)) 124 124 { 125 125 fclose($this->fp); branches/dwhittle/1.2/lib/routing/sfPatternRouting.class.php
r10594 r10973 553 553 if (!$found) 554 554 { 555 throw new sfConfigurationException(sprintf('Unable to find a matching routing rule to generate url for params "%s".', var_export($params, true)));555 throw new sfConfigurationException(sprintf('Unable to find a matching routing rule to generate url for params "%s".', str_replace("\n", '', var_export($params, true)))); 556 556 } 557 557 } … … 617 617 if ($this->options['logging']) 618 618 { 619 $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Match route [%s] for "%s" ', $routeInfo['name'], $routeInfo['route']))));619 $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Match route [%s] for "%s" with parameters %s', $routeInfo['name'], $routeInfo['route'], str_replace("\n", '', var_export($routeInfo['parameters'], true)))))); 620 620 } 621 621 } branches/dwhittle/1.2/lib/util/sfInflector.class.php
r9051 r10973 30 30 $tmp = $lower_case_and_underscored_word; 31 31 $tmp = sfToolkit::pregtr($tmp, array('#/(.?)#e' => "'::'.strtoupper('\\1')", 32 '/(^|_ )(.)/e' => "strtoupper('\\2')"));32 '/(^|_|-)+(.)/e' => "strtoupper('\\2')")); 33 33 34 34 return $tmp;
