Skip to content

Commit

Permalink
Merge branch 'feature/fuel_exceptions' into develop
Browse files Browse the repository at this point in the history
* feature/fuel_exceptions:
  Add Peter Wiggers to contributers
  FuelException instead of Fuel_Exception (removed in FuelPHP v1.2)
  • Loading branch information
canton7 committed May 19, 2012
2 parents d70f305 + 49ad8f5 commit 1695bde
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions classes/casset.php
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public static function add_deps($type, $group, $new_deps)
if (!is_array($new_deps))
$new_deps = array($new_deps);
if (!array_key_exists($group, static::$groups[$type]))
throw new \Fuel_Exception("Group $group ($type) doesn't exist, so can't add deps to it.");
throw new Casset_Exception("Group $group ($type) doesn't exist, so can't add deps to it.");
// Avoid duplicates in deps array
$deps = &static::$groups[$type][$group]['deps'];
$deps = array_unique(array_merge($deps, $new_deps));
Expand Down Expand Up @@ -1279,7 +1279,7 @@ protected static function clear_cache_base($filter = '*', $before = 'now')

}

class Casset_Exception extends \Fuel_Exception {
class Casset_Exception extends \FuelException {
}

/* End of file casset.php */
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,7 @@ The following people have helped Casset become what it is, so thank you!
- [gnodeb](https://github.com/gnodeb)
- [Derek Myers](https://github.com/dmyers)
- [Ian Turgeon](https://github.com/iturgeon)
- [Peter Wiggers](https://github.com/pwwebdev)

Contributing
------------
Expand Down

0 comments on commit 1695bde

Please sign in to comment.