# HG changeset patch
# User Dan
# Date 1261898855 18000
# Node ID 449fdd113eb086d3f32f82e083b3f90f3d700e1a
# Parent  70169f5721904bc66eb5e72a75e399fa125e1005
Version bump to 1.1.8

diff -r 70169f572190 -r 449fdd113eb0 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Dec 27 02:27:35 2009 -0500
@@ -0,0 +1,5 @@
+\.marks$
+\.php~$
+\.js~$
+\.tpl~$
+\.css~$
diff -r 70169f572190 -r 449fdd113eb0 includes/common.php
--- a/includes/common.php	Sun Dec 27 02:25:29 2009 -0500
+++ b/includes/common.php	Sun Dec 27 02:27:35 2009 -0500
@@ -43,7 +43,7 @@
 // be the expected output of enano_version(), which will always be in the
 // format of 1.0.2, 1.0.2a1, 1.0.2b1, 1.0.2RC1
 // You'll want to change this for custom distributions.
-$version = '1.1.7';
+$version = '1.1.8';
 
 /**
  * Returns a floating-point number with the current UNIX timestamp in microseconds. Defined very early because we gotta call it
diff -r 70169f572190 -r 449fdd113eb0 install/includes/common.php
--- a/install/includes/common.php	Sun Dec 27 02:25:29 2009 -0500
+++ b/install/includes/common.php	Sun Dec 27 02:27:35 2009 -0500
@@ -15,7 +15,7 @@
 
 // Our version number. This needs to be changed for any custom releases.
 $installer_version = array(
-  'version' => '1.1.7',
+  'version' => '1.1.8',
   'type' => 'beta'
   // If type is set to "rc", "beta", or "alpha", optionally another version number can be issued with the key 'sub':
   // 'sub' => '3' will produce Enano 1.1.1a3 / Enano 1.1.1 alpha 3
diff -r 70169f572190 -r 449fdd113eb0 install/schemas/upgrade/1.1.7-1.1.8-mysql.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install/schemas/upgrade/1.1.7-1.1.8-mysql.sql	Sun Dec 27 02:27:35 2009 -0500
@@ -0,0 +1,1 @@
+
diff -r 70169f572190 -r 449fdd113eb0 install/schemas/upgrade/1.1.7-1.1.8-postgresql.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/install/schemas/upgrade/1.1.7-1.1.8-postgresql.sql	Sun Dec 27 02:27:35 2009 -0500
@@ -0,0 +1,1 @@
+
diff -r 70169f572190 -r 449fdd113eb0 install/upgrade.php
--- a/install/upgrade.php	Sun Dec 27 02:25:29 2009 -0500
+++ b/install/upgrade.php	Sun Dec 27 02:27:35 2009 -0500
@@ -18,12 +18,12 @@
 // The list of versions in THIS AND PREVIOUS branches, in chronological order.
 $enano_versions = array();
 $enano_versions['1.0'] = array('1.0', '1.0.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4', '1.0.5', '1.0.6', '1.0.6pl1');
-$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3', '1.1.4', '1.1.5', '1.1.6', '1.1.7');
+$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3', '1.1.4', '1.1.5', '1.1.6', '1.1.7', '1.1.8');
 
 // If true, this will do a full langimport instead of only adding new strings.
 // Will probably be left on, but some change probably needs to be made to mark
 // strings as customized in the DB.
-$do_langimport = true;
+$do_langimport = false;
 
 // Turn on every imaginable API hack to make common load on older databases
 define('IN_ENANO_UPGRADE', 1);
@@ -42,6 +42,13 @@
 require_once('includes/common.php');
 @ini_set('display_errors', 'on');
 
+// do langimport if below 1.1.7
+$versions_flipped = array_flip($enano_versions['1.1']);
+if ( !isset($versions_flipped[ enano_version() ]) || $versions_flipped[ enano_version() ] < $versions_flipped['1.1.7'] )
+{
+  $do_langimport = true;
+}
+
 if ( in_array(enano_version(), array('1.1.1', '1.1.2', '1.1.3', '1.1.4', '1.1.5')) || substr(enano_version(), 0, 3) == '1.0' )
   define('ENANO_UPGRADE_USE_AES_PASSWORDS', 1);
 
@@ -153,6 +160,9 @@
     echo $lang->get('upgrade_login_msg_auth_needed_body_level1');
   }
   ?></p>
+  <p>
+  <?php echo $lang->get('upgrade_login_msg_local_auth'); ?>
+  </p>
   <table border="0" cellspacing="0" cellpadding="5" style="margin: 0 auto;">
   <tr>
     <td><?php echo $lang->get('user_login_field_username'); ?>:</td>
diff -r 70169f572190 -r 449fdd113eb0 language/english/install.json
--- a/language/english/install.json	Sun Dec 27 02:25:29 2009 -0500
+++ b/language/english/install.json	Sun Dec 27 02:27:35 2009 -0500
@@ -429,6 +429,7 @@
       login_msg_auth_needed_title: 'Authentication needed',
       login_msg_auth_needed_body_level1: 'To continue, you need to log in. Please enter an administrator username and password below.',
       login_msg_auth_needed_body_level2: 'To confirm the upgrade, you need to re-enter your login information. Please enter your username and password below.',
+      login_msg_local_auth: '<b>Note:</b> The upgrade tool doesn\'t recognize any authentication plugins. Even if you use authentication plugins in Enano, you need to enter a local administrator username and password to use this upgrade tool.',
       login_btn_login: 'Log in',
       login_err_failed: 'The following error occurred during the login process: %error_code%.',