Merge branch 'hotfix/1.1.3'

mikedfunk · Mar 3, 2012 · e243d78 · e243d78
2 parents 41cf8ed + 1e7efc5
commit e243d78
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@ Setup
 1. Install sparks on [GetSparks.org](http://getsparks.org)
 2. Edit **config/authentication.php** with the proper stuff like redirect urls, etc.
 3. Import **setup.sql** in PHPMyAdmin or something
-4. Load the spark: ```$this->load->spark('ci_authentication/1.1.2');```
+4. Load the spark: ```$this->load->spark('ci_authentication/1.1.3');```
 5. Load the library: ```$this->load->library('ci_authentication');```
 
-*NOTE: If cloning this directly, be sure to also clone [CI Alerts](https://github.com/mikedfunk/CI-Alerts) version 1.1.1 as a spark and load it. CI Alerts are required for CI Authentication. The spark format requires this already as a dependency.*
+*NOTE: If cloning this directly, be sure to also clone [CI Alerts](https://github.com/mikedfunk/CI-Alerts) version 1.1.2 as a spark and load it. CI Alerts are required for CI Authentication. The spark format requires this already as a dependency.*
 
 Restrict
 ----------------------------

diff --git a/config/ci_authentication.php b/config/ci_authentication.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication.php
- * @version		1.1.1
+ * @version		1.1.3
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/helpers/ci_authentication_helper.php b/helpers/ci_authentication_helper.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication_helper.php
- * @version		1.1.2
+ * @version		1.1.3
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/libraries/ci_authentication.php b/libraries/ci_authentication.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication.php
- * @version		1.1.2
+ * @version		1.1.3
  * @date		02/17/2012
  * 
  * Copyright (c) 2012
@@ -50,7 +50,7 @@ public function __construct()
 		$this->_ci =& get_instance();
 		log_message('debug', 'CI Authentication: library initialized.');
 
-		$this->_ci->load->spark('ci_alerts/1.1.1');
+		$this->_ci->load->spark('ci_alerts/1.1.2');
 		log_message('debug', 'CI Authentication: CI Alerts spark initialized.');
 	}
 

diff --git a/models/ci_authentication_model.php b/models/ci_authentication_model.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication_model.php
- * @version		1.1.2
+ * @version		1.1.3
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/spark.info b/spark.info
@@ -7,11 +7,11 @@ name: CI Authentication
 
 # This is the current version of this spark. All sparks should be in
 #  x.x.x format. Validation will fail otherwise.
-version: 1.1.2
+version: 1.1.3
 
 # This is the version of CodeIgniter this spark is compatible up to. It should
 #  be in x.x.x format
 compatibility: 2.1.0
 
 #dependencies:
-ci_alerts: 1.1.1
+ci_alerts-1: 1.1.2