summaryrefslogtreecommitdiff
path: root/system/core/Kohana.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-12-23 12:42:57 -0800
committerBharat Mediratta <bharat@menalto.com>2009-12-23 12:42:57 -0800
commit3e8e13bd2533ff7e3493b27c8a8587dfb65e1b26 (patch)
tree4b89142230e516b3d327f4e835edb49c76fa237f /system/core/Kohana.php
parent05c50a052348a4ae664e0b4ca475f9fb3228f24b (diff)
Updated Kohana to r4728
Diffstat (limited to 'system/core/Kohana.php')
-rw-r--r--system/core/Kohana.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index 740adb80..29ca708c 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -2,7 +2,7 @@
/**
* Provides Kohana-specific helper functions. This is where the magic happens!
*
- * $Id: Kohana.php 4724 2009-12-21 16:28:54Z isaiah $
+ * $Id: Kohana.php 4726 2009-12-23 18:58:53Z isaiah $
*
* @package Core
* @author Kohana Team
@@ -810,11 +810,8 @@ abstract class Kohana_Core {
{
if ($required === TRUE)
{
- // Directory i18n key
- $directory = 'core.'.inflector::singular($directory);
-
// If the file is required, throw an exception
- throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => Kohana::message($directory), ':file:' =>$filename));
+ throw new Kohana_Exception('The requested :resource:, :file:, could not be found', array(':resource:' => __($directory), ':file:' =>$filename));
}
else
{