Changeset 3087 for tags

Timestamp:

07/12/2008 12:05:17 AM (5 months ago)

Author:

armen

Message:

Merged 3011 in to the 2.1.3

Files:

• tags/2.1.3/modules/forge/libraries/Form_Upload.php (modified) (1 diff)

tags/2.1.3/modules/forge/libraries/Form_Upload.php

@@ -67 +67 @@
 
                 // Make the path asbolute and normalize it
-                $dir = str_replace('\\', '/', realpath($dir)).'/';
+                $directory = str_replace('\\', '/', realpath($dir)).'/';
 
                 // Make sure the upload director is valid and writable
-                if ($dir === '/' OR ! is_dir($dir) OR ! is_writable($dir))
+                if ($directory === '/' OR ! is_dir($directory) OR ! is_writable($directory))
                         throw new Kohana_Exception('upload.not_writable', $dir);
 
-                $this->directory = $dir;
+                $this->directory = $directory;
         }