From a638c2348e361fef24ed1e2894c9810f3b133205 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sat, 22 Sep 2007 12:40:20 +0000
Subject: [PATCH] Bugtracker #4077 - clearer message on max upload size

---
 e107_admin/upload.php                       | 8 ++++----
 e107_languages/English/admin/lan_upload.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index 3ee558f83..6252de2ec 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/upload.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2006-12-07 15:41:50 $
-|     $Author: sweetas $
+|     $Revision: 1.3 $
+|     $Date: 2007-09-22 12:40:03 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -276,7 +276,7 @@ $text = "<div style='text-align:center'>
 
 	<tr>
 	<td style='width:70%' class='forumheader3'>".UPLLAN_33."<br />
-	<span class='smalltext'>".UPLLAN_34." ".ini_get('upload_max_filesize')." )</span></td>
+	<span class='smalltext'>".UPLLAN_34." (upload_max_filesize = ".ini_get('upload_max_filesize').", post_max_size = ".ini_get('post_max_size')." )</span></td>
 	<td style='width:30%' class='forumheader3'>". $rs->form_text("upload_maxfilesize", 10, $pref['upload_maxfilesize'], 10)."
 	</td>
 	</tr>
diff --git a/e107_languages/English/admin/lan_upload.php b/e107_languages/English/admin/lan_upload.php
index ac9462007..e1096d21e 100644
--- a/e107_languages/English/admin/lan_upload.php
+++ b/e107_languages/English/admin/lan_upload.php
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_upload.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:42 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2007-09-22 12:40:12 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 define("UPLLAN_1", "Upload removed from list.");
@@ -43,7 +43,7 @@ define("UPLLAN_30", "Choose how to store uploaded files, either as normal files
 define("UPLLAN_31", "Flatfile");
 define("UPLLAN_32", "Binary");
 define("UPLLAN_33", "Maximum file size");
-define("UPLLAN_34", "Maximum upload size in bytes - leave blank to conform to php.ini setting ( php.ini setting is");
+define("UPLLAN_34", "Maximum upload size in bytes - leave blank to use settings from php.ini");
 define("UPLLAN_35", "Allowed file types");
 define("UPLLAN_36", "Please enter one type per line");
 define("UPLLAN_37", "Permission");