# HG changeset patch
# User Dan Fuhry <dan@enanocms.org>
# Date 1310524641 14400
# Node ID 0fa28c5aabe928df241f1c67f1b86968e2fb7fa9
# Parent  7e6537fd473012914d42d12ad614f30e0f404522
Release prep 1.0.6pl4

diff -r 7e6537fd4730 -r 0fa28c5aabe9 includes/common.php
--- a/includes/common.php	Tue Jul 12 22:13:37 2011 -0400
+++ b/includes/common.php	Tue Jul 12 22:37:21 2011 -0400
@@ -37,7 +37,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.0.6pl3';
+$version = '1.0.6pl4';
 
 /**
  * Returns a floating-point number with the current UNIX timestamp in microseconds. Defined very early because we gotta call it
diff -r 7e6537fd4730 -r 0fa28c5aabe9 includes/functions.php
--- a/includes/functions.php	Tue Jul 12 22:13:37 2011 -0400
+++ b/includes/functions.php	Tue Jul 12 22:37:21 2011 -0400
@@ -1228,6 +1228,8 @@
       '1.0.5'  => 'Ferrishyn',
       '1.0.6'  => 'Roane',
       '1.0.6pl1' => 'Roane patchlevel 1',
+      '1.0.6pl3' => 'Roane patchlevel 3',
+      '1.0.6pl4' => 'Roane patchlevel 4'
     );
   $version = enano_version();
   if ( isset($names[$version]) )
diff -r 7e6537fd4730 -r 0fa28c5aabe9 install.php
--- a/install.php	Tue Jul 12 22:13:37 2011 -0400
+++ b/install.php	Tue Jul 12 22:37:21 2011 -0400
@@ -30,7 +30,7 @@
 
 define('IN_ENANO_INSTALL', 'true');
 
-define('ENANO_VERSION', '1.0.6pl3');
+define('ENANO_VERSION', '1.0.6pl4');
 define('ENANO_RELEASE_NAME', 'Roane');
 // In beta versions, define ENANO_BETA_VERSION here
 
diff -r 7e6537fd4730 -r 0fa28c5aabe9 upgrade.php
--- a/upgrade.php	Tue Jul 12 22:13:37 2011 -0400
+++ b/upgrade.php	Tue Jul 12 22:37:21 2011 -0400
@@ -70,7 +70,7 @@
 // Everything related to versions goes here!
 
 // Valid versions to upgrade from
-$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4', '1.0.5', '1.0.6', '1.0.6pl1', '1.0.6pl2');
+$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4', '1.0.5', '1.0.6', '1.0.6pl1', '1.0.6pl2', '1.0.6pl3');
 
 // Basically a list of dependencies, which should be resolved automatically
 // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not
@@ -92,9 +92,10 @@
     '1.0.4' => Array('1.0.5'),
     '1.0.5' => array('1.0.6'),
     '1.0.6' => array('1.0.6pl1'),
-    '1.0.6pl1' => array('1.0.6pl2')
+    '1.0.6pl1' => array('1.0.6pl2'),
+    '1.0.6pl2' => array('1.0.6pl3')
   );
-$this_version   = '1.0.6pl3';
+$this_version   = '1.0.6pl4';
 $func_list = Array(
     '1.0' => Array('u_1_0_1_update_del_votes'),
     '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text'), // ,
diff -r 7e6537fd4730 -r 0fa28c5aabe9 upgrade.sql
--- a/upgrade.sql	Tue Jul 12 22:13:37 2011 -0400
+++ b/upgrade.sql	Tue Jul 12 22:37:21 2011 -0400
@@ -3,7 +3,9 @@
 -- ALL NON-SQL LINES, even otherwise blank lines, must start with "--" or they will get sent to MySQL!
 -- Common tasks (version numbers)
 DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version';
-INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.6pl3' );
+INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.6pl4' );
+---BEGIN 1.0.6pl4---
+---END 1.0.6pl4---
 ---BEGIN 1.0.6pl3---
 ---END 1.0.6pl3---
 ---BEGIN 1.0.6pl2---