Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix-2.1.4'

  • Loading branch information...
commit e1132ad453724ba54d1691350661c99d39341baf 2 parents d6e5f6f + f4e30b6
Dave Kiger authored
View
14 CHANGE_LOG
@@ -1,3 +1,17 @@
+= VERSION 2.1.4 =
+ * fixed: incorporated bug fix from denis-bykov: STDIN built-in constant can be undefined causing the init controller to enter an infinite loop
+ * fixed: removed test data from schema.php and test_data.php
+ * fixed: updated the neglected CHANGE_LOG ;)
+
+= VERSION 2.1.3 =
+ * fixed: versioning error
+
+= VERSION 2.1.2 =
+ * fixed: simplified header
+
+= VERSION 2.1.1 =
+ * fixed: PHP 5.3 strict errors
+
= VERSION 2.1.0 =
* new: added option to build command to add test data to the database after the build is complete (build with_data)
* new: added ability to specify the name of the migrations table during initialization (issue 5)
View
1  db/schema.php
@@ -44,7 +44,6 @@ public function build()
*
* $this->dbObj->exec('CREATE TABLE `testing` ( `id` INT(11) AUTO_INCREMENT NOT NULL, `vals` INT(11) NOT NULL, PRIMARY KEY ( `id` ))');
*/
- $this->dbObj->exec('CREATE TABLE `testing` (`id` INT(11) AUTO_INCREMENT NOT NULL, `vals` INT(11) NOT NULL, PRIMARY KEY ( `id`)) ENGINE=InnoDB');
}
}
View
1  db/test_data.php
@@ -27,7 +27,6 @@ public function build()
*
* $this->dbObj->exec("INSERT INTO `testing` (id, username, password) VALUES (1, 'my_username', 'my_password')");
*/
- $this->dbObj->exec("INSERT INTO `testing` (id, vals) VALUES (1, 1234434)");
}
}
View
8 lib/init.php
@@ -50,6 +50,14 @@
define('MPM_METHOD_MYSQLI', 2);
}
+if (!defined('STDIN'))
+{
+ /**
+ * In some cases STDIN built-in can be undefined
+ */
+ define('STDIN', fopen("php://stdin","r"));
+}
+
/**
* Include the MpmClassUndefinedException class.
*/
View
2  migrate.php
@@ -28,7 +28,7 @@
/**
* Version Number - for reference
*/
-define('MPM_VERSION', '2.1.3');
+define('MPM_VERSION', '2.1.4');
/**
* Include the init script.
Please sign in to comment.
Something went wrong with that request. Please try again.