Changeset 2377

Timestamp:

03/29/08 05:50:38 (5 months ago)

Author:

Geert

Message:

Added cache.driver_implements error just as is done with all other drivers.
Various other cleanups as well.

Location:

trunk/system

Files:

• i18n/en_US/cache.php (modified) (1 diff)
• i18n/nl_NL/cache.php (modified) (1 diff)
• libraries/Cache.php (modified) (1 diff)
• libraries/Pagination.php (modified) (3 diffs)
• libraries/View.php (modified) (2 diffs)

trunk/system/i18n/en_US/cache.php

@@ -5 +5 @@
     'undefined_group'      => 'The %s group is not defined in your configuration.',
     'driver_not_supported' => 'The requested Cache driver, %s, was not found.',
+    'driver_implements'    => 'The requested Cache driver, %s, does not implement Cache_Driver.',
     'extension_not_loaded' => 'The %s PHP extension must be loaded to use this driver.',
     'unwritable'           => 'The configured storage location, <tt>%s</tt>, is not writable.',

trunk/system/i18n/nl_NL/cache.php

@@ -4 +4 @@
 (
     'undefined_group'      => 'De %s groep is niet gedefinieerd in uw configuratie.',
-    'driver_not_supported' => 'De %s cache driver werd niet gevonden.',
+    'driver_not_supported' => 'De %s Cache driver werd niet gevonden.',
+    'driver_implements'    => 'De %s Cache driver implementeert de Cache_Driver interface niet.',
     'extension_not_loaded' => 'De %s PHP extensie moet geladen zijn om deze driver te gebruiken.',
     'unwritable'           => 'De geconfigureerde opslaglocatie, <tt>%s</tt>, is niet schrijfbaar.',

trunk/system/libraries/Cache.php

@@ -76 +76 @@
         // Validate the driver
         if ( ! ($this->driver instanceof Cache_Driver))
-            throw new Kohana_Exception('cache.driver_not_supported', 'Cache drivers must use the Cache_Driver interface.');
+            throw new Kohana_Exception('cache.driver_implements', $this->config['driver']);
 
         Log::add('debug', 'Cache Library initialized');

trunk/system/libraries/Pagination.php

@@ -88 +88 @@
         {
             // Use current URI if no base_url set
-            $this->url = ($this->base_url == '') ? Router::$segments : explode('/', trim($this->base_url, '/'));
+            $this->url = ($this->base_url === '') ? Router::$segments : explode('/', trim($this->base_url, '/'));
 
             // Convert uri 'label' to corresponding integer if needed
@@ -125 +125 @@
         // If there is no first/last/previous/next page, relative to the
         // current page, value is set to FALSE. Valid page number otherwise.
-        $this->first_page         = ($this->current_page == 1) ? FALSE : 1;
+        $this->first_page         = ($this->current_page === 1) ? FALSE : 1;
         $this->last_page          = ($this->current_page >= $this->total_pages) ? FALSE : $this->total_pages;
         $this->previous_page      = ($this->current_page > 1) ? $this->current_page - 1 : FALSE;
@@ -144 +144 @@
     {
         // Hide single page pagination
-        if ($this->auto_hide == TRUE AND $this->total_pages <= 1)
+        if ($this->auto_hide === TRUE AND $this->total_pages <= 1)
             return '';
 

trunk/system/libraries/View.php

@@ -195 +195 @@
             }
 
-            if ($print == TRUE)
+            if ($print === TRUE)
             {
                 // Display the output
@@ -207 +207 @@
             header('Content-Type: '.$this->kohana_filetype[0]);
 
-            if ($print == TRUE)
+            if ($print === TRUE)
             {
                 if ($file = fopen($this->kohana_filename, 'rb'))