summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2010-07-26 05:24:54 +0200
committerDerek Allard <derek.allard@ellislab.com>2010-07-26 05:24:54 +0200
commit073e15cea53c53b73a215a86a22aabe4d5db2549 (patch)
treed320e1bc8a3e8d460969dd94d87bc40e6426146e
parentb3f10a23e4eb51f9236af0647eee4607776fee23 (diff)
parent6dba102f71958f1a39f63fd0cc4885327354f752 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
-rw-r--r--user_guide/libraries/file_uploading.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 28cf8de3e..31041341f 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -420,7 +420,7 @@ Here is the array prototype:</p>
<tr><td class="td"><strong>image_width</strong></td>
<td class="td">Image width.</td></tr>
-<tr><td class="td"><strong>image_heigth</strong></td>
+<tr><td class="td"><strong>image_height</strong></td>
<td class="td">Image height</td></tr>
<tr><td class="td"><strong>image_type</strong></td>