From b76a85e2992000bd6fa21a58050ffcac0f8fba39 Mon Sep 17 00:00:00 2001
From: Joakim Reinert <mail@jreinert.com>
Date: Fri, 1 May 2015 23:18:48 +0200
Subject: Set max upload size and file count in upload_form view only

---
 application/views/file/upload_form.php | 4 ++--
 application/views/header.php           | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index f9f40475d..8fc7b9f59 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -70,8 +70,8 @@
 
 <script type="text/javascript">
     /* <![CDATA[ */
-	var max_upload_size = "<?php echo $max_upload_size; ?>";
-	var max_files_per_upload = "<?php echo ini_get("max_file_uploads"); ?>";
+	window.appConfig.maxUploadSize = "<?php echo $max_upload_size; ?>";
+	window.appConfig.maxFilesPerUpload = "<?php echo ini_get("max_file_uploads"); ?>";
     /* ]]> */
 </script>
 
diff --git a/application/views/header.php b/application/views/header.php
index f77487ba9..89a3c8617 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -29,10 +29,7 @@ if (is_cli_client() && !isset($force_full_html)) {
 	<script type="text/javascript">
 		/* <![CDATA[ */
 		var require = { baseUrl: '/data/js' };
-		window.appConfig = {
-			maxUploadSize: <?php echo $max_upload_size; ?>,
-			maxFilesPerUpload: <?php echo ini_get("max_file_uploads"); ?>
-		};
+		window.appConfig = {};
 		/* ]]> */
 	</script>
 	<script data-main="main" src="/data/js/vendor/require.js"></script>
-- 
cgit v1.2.3-24-g4f1b