Merge branch '2.2/develop' into 2.2/master

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.2.1 (09 March 2013)
+
+### Nova Core
+
+* Updated the jQuery prettyPhoto plugin to version 3.1.5.
+
+### Bug Fixes
+
+* Fixed update message always displaying because of a wrong version number in the core.
+
 ## 2.2.0 (15 February 2013)
 
 * Added reply to header to most of the emails that are sent from Nova. ([#217](https://github.com/anodyne/nova/issues/217))

README.md

@@ -4,7 +4,7 @@ Anodyne Production's next-generation RPG management system combines popular feat
 
 ## Current Version
 
-2.2.0
+2.2.1
 
 ## Bug Tracker
 

nova/modules/assets/install/data.php

@@ -2244,7 +2244,7 @@
 		'sys_install_date' => now(),
 		'sys_version_major' => 2,
 		'sys_version_minor' => 2,
-		'sys_version_update' => 0)
+		'sys_version_update' => 1)
 );
 
 $tour_fields = array(

nova/modules/assets/update/update_220.php

@@ -0,0 +1,153 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Update Nova from 2.2 to 2.2.1
+ */
+$system_info	= null;
+$add_tables		= null;
+$drop_tables	= null;
+$rename_tables	= null;
+$add_column		= null;
+$modify_column	= null;
+$drop_column	= null;
+
+/**
+ * Version info for the database
+ */
+$system_info = array(
+	'sys_last_update'		=> now(),
+	'sys_version_major'		=> 2,
+	'sys_version_minor'		=> 2,
+	'sys_version_update'	=> 1
+);
+
+/*
+|---------------------------------------------------------------
+| TABLES TO ADD
+|
+| $add_tables = array(
+|	'table_name' => array(
+|		'id' => 'table_id',
+|		'fields' => 'fields_table_name')
+| );
+|
+| $fields_table_name = array(
+|	'table_id' => array(
+|		'type' => 'INT',
+|		'constraint' => 6,
+|		'auto_increment' => TRUE),
+|	'table_field_1' => array(
+|		'type' => 'VARCHAR',
+|		'constraint' => 255,
+|		'default' => ''),
+|	'table_field_2' => array(
+|		'type' => 'INT',
+|		'constraint' => 4,
+|		'default' => '99')
+| );
+|---------------------------------------------------------------
+*/
+
+if ($add_tables !== null)
+{
+	foreach ($add_tables as $key => $value)
+	{
+		$this->dbforge->add_field($$value['fields']);
+		$this->dbforge->add_key($value['id'], true);
+		$this->dbforge->create_table($key, true);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| TABLES TO DROP
+|
+| $drop_tables = array('table_name');
+|---------------------------------------------------------------
+*/
+
+if ($drop_tables !== null)
+{
+	foreach ($drop_tables as $value)
+	{
+		$this->dbforge->drop_table($value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| TABLES TO RENAME
+|
+| $rename_tables = array('old_table_name' => 'new_table_name');
+|---------------------------------------------------------------
+*/
+
+if ($rename_tables !== null)
+{
+	foreach ($rename_tables as $key => $value)
+	{
+		$this->dbforge->rename_table($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO ADD
+|
+| $add_column = array(
+|	'table_name' => array(
+|		'field_name_1' => array('type' => 'TEXT'),
+|		'field_name_2' => array(
+|			'type' => 'VARCHAR',
+|			'constraint' => 100)
+|	)
+| );
+|---------------------------------------------------------------
+*/
+
+if ($add_column !== null)
+{
+	foreach ($add_column as $key => $value)
+	{
+		$this->dbforge->add_column($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO MODIFY
+|
+| $modify_column = array(
+|	'table_name' => array(
+|		'old_field_name' => array(
+|			'name' => 'new_field_name',
+|			'type' => 'TEXT')
+|	)
+| );
+|---------------------------------------------------------------
+*/
+
+if ($modify_column !== null)
+{
+	foreach ($modify_column as $key => $value)
+	{
+		$this->dbforge->modify_column($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO DROP
+|
+| $drop_column = array(
+|	'table_name' => array('field_name')
+| );
+|---------------------------------------------------------------
+*/
+
+if ($drop_column !== null)
+{
+	foreach ($drop_column as $key => $value)
+	{
+		$this->dbforge->drop_column($key, $value[0]);
+	}
+}

nova/modules/assets/update/versions.php

@@ -14,5 +14,5 @@
 	'120', '121', '122', '123', '124', '125', '126',
 	'200', '201', '202', '203',
 	'210', '211', '212', '213',
-	'220',
+	'220', '221',
 );

nova/modules/assets/version.yml

@@ -1,9 +1,9 @@
-version: 2.2.0
+version: 2.2.1
 version_major: 2
 version_minor: 2
-version_update: 0
-severity: major
+version_update: 1
+severity: minor
 notes: |
-  Nova 2.2 adds two features to Nova as well as addressing several bugs. Most emails sent from Nova will now include a reply to header so that any replies to the email notification will go to the original author. The author listings now include links to the character bio pages as well. Thanks to Jordan Jay for his MOD to do this; we've expanded it to include mission posts, personal logs, news items, wiki pages and comments. In addition, we've added an option for retrieving specific fields for third-party developers.
-date: 03 February 2013
+  Nova 2.2.1 fixes an issue where the update notification box showed up all the time because of a wrong version number stored in the Nova core.
+date: 09 March 2013
 link: http://www.anodyne-productions.com/nova/index.php

nova/modules/core/config/info.php

@@ -2,10 +2,10 @@
 
 define('APP_NAME',				'Nova');
 
-define('APP_VERSION',			'2.1.4');
+define('APP_VERSION',			'2.2.1');
 define('APP_VERSION_MAJOR',		2);
-define('APP_VERSION_MINOR',		1);
-define('APP_VERSION_UPDATE',	4);
+define('APP_VERSION_MINOR',		2);
+define('APP_VERSION_UPDATE',	1);
 
 define('WIKI_NAME',				'Thresher');
 define('WIKI_VERSION',			'Release 2');