Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r2441 -r2445
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 2441)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 2445)
@@ -16,7 +16,7 @@
 		$_SERVER['PATH_INFO'] = $_SERVER['PHP_SELF'];
 	}
 	$path_info = str_replace('\\', '/', dirname($_SERVER['PATH_INFO']));
-	
+
 //	echo "replacing ".$path_info.' (path_info) with "" in '.$full_path.' (full_path) = '.str_replace($path_info, '', $full_path).'<br>';
 	$_SERVER['DOCUMENT_ROOT'] = str_replace($path_info, '', $full_path);
 }
@@ -28,7 +28,7 @@
 include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
 
 if( file_exists(FULL_PATH.'/debug.php') )
-{ 
+{
 	k4_include_once(FULL_PATH.'/debug.php');
 	if( defined('DEBUG_MODE')&&DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php');
 }
@@ -49,7 +49,7 @@
 	echo 'In-Portal is probably not installed, or configuration file is missing.<br>';
 	echo 'Please use the installation script to fix the problem.<br><br>';
 	if ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';
-	
+
 	echo '<a href="'.PROTOCOL.SERVER_NAME.BASE_PATH.$ins.'/install.php">Go to installation script</a><br><br>';
 	flush();
 	exit;
@@ -76,7 +76,7 @@
 safeDefine('IMAGES_PATH', '/kernel/images/');
 safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
 safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
-safeDefine('MAX_UPLOAD_SIZE', 50000000);
+safeDefine('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size')));
 
 safeDefine('CACHE_CONFIGS_FILES', 1);
 safeDefine('EXPERIMENTAL_PRE_PARSE', 1);