Index: trunk/admin/install.php
===================================================================
diff -u -N -r1193 -r1199
--- trunk/admin/install.php	(.../install.php)	(revision 1193)
+++ trunk/admin/install.php	(.../install.php)	(revision 1199)
@@ -1,5 +1,5 @@
 <?php
-error_reporting(0);
+error_reporting(E_ALL);
 
 define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named
 $general_error = '';
@@ -834,11 +834,9 @@
 					$tmp_data = explode('Code==:', $rcontents);
 				
 	            	$data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
-<<<<<<< install.php
-					a83570933e44bc66b31dd7127cf3f23a($data);
-=======
+
 					_inst_ParseLicense($data);
->>>>>>> 1.71
+
 		            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 		            if($ValidLicense)
 		            {
@@ -890,11 +888,8 @@
 				$tmp_data = explode('Code==:', $rcontents);
 							
 	            $data = base64_decode(str_replace("In-Portal License File - do not edit!\n", "", $tmp_data[0]));				
-<<<<<<< install.php
-	            a83570933e44bc66b31dd7127cf3f23a($data);
-=======
 	            _inst_ParseLicense($data);
->>>>>>> 1.71
+
 	            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
 	            if($ValidLicense)
 	            {
@@ -948,11 +943,9 @@
             $data = $tmp_data[0];
             
             @unlink($pathtoroot."themes/tmp.lic");
-<<<<<<< install.php
-            a83570933e44bc66b31dd7127cf3f23a($data);
-=======
+
             _inst_ParseLicense($data);
->>>>>>> 1.71
+
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {
@@ -973,11 +966,9 @@
         if(strlen($g_License))
         {
             $lic = base64_decode($g_License);
-<<<<<<< install.php
-            a83570933e44bc66b31dd7127cf3f23a($lic);
-=======
+
             _inst_ParseLicense($lic);
->>>>>>> 1.71
+
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));
             if($ValidLicense)
             {            
@@ -1077,11 +1068,8 @@
     $lic = base64_decode($g_License);
     if(strlen($lic))
     {
-<<<<<<< install.php
-            a83570933e44bc66b31dd7127cf3f23a($lic);
-=======
             _inst_ParseLicense($lic);
->>>>>>> 1.71
+
             $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
     }
 
@@ -1115,11 +1103,7 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
-<<<<<<< install.php
-           a83570933e44bc66b31dd7127cf3f23a($lic);
-=======
            _inst_ParseLicense($lic);
->>>>>>> 1.71
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1166,11 +1150,8 @@
         $lic = base64_decode($g_License);
         if(strlen($lic))
         {
-<<<<<<< install.php
-           a83570933e44bc66b31dd7127cf3f23a($lic);
-=======
            _inst_ParseLicense($lic);
->>>>>>> 1.71
+
            $ValidLicense = ((strlen($i_User)>0) && (strlen($i_Pswd)>0));            
         }
     }
@@ -1626,11 +1607,9 @@
     $ado->Execute($sql);
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'";
     $ado->Execute($sql);
-<<<<<<< install.php
-    $Modules = a48d819089308a9aeb447e7248b2587f();
-=======
+
     $Modules = _inst_GetModuleList();
->>>>>>> 1.71
+
     
     if (count($Modules) > 0) {    
     	$include_file = $pathtoroot.$admin."/install/modselect.php";