Merge branch '3.3/develop' into 3.3/master

tyllo · Sep 1, 2013 · 1faff2a · 1faff2a
2 parents 6537e4a + 5fd2f72
commit 1faff2a
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 11 deletions.
diff --git a/application/bootstrap.php b/application/bootstrap.php
@@ -56,13 +56,26 @@
  */
 ini_set('unserialize_callback_func', 'spl_autoload_call');
 
+/**
+ * Set the mb_substitute_character to "none"
+ *
+ * @link http://www.php.net/manual/function.mb-substitute-character.php
+ */
+mb_substitute_character('none');
+
 // -- Configuration and initialization -----------------------------------------
 
 /**
  * Set the default language
  */
 I18n::lang('en-us');
 
+if (isset($_SERVER['SERVER_PROTOCOL']))
+{
+	// Replace the default protocol.
+	HTTP::$protocol = $_SERVER['SERVER_PROTOCOL'];
+}
+
 /**
  * Set Kohana::$environment if a 'KOHANA_ENV' environment variable has been supplied.
  *

diff --git a/composer.json b/composer.json
@@ -1,5 +1,6 @@
 {
 	"require": {
-		"phpunit/phpunit": "3.7.*"
+		"phpunit/phpunit": "3.7.24",
+		"phing/phing": "dev-master"
 	}
 }
diff --git a/modules/auth b/modules/auth
diff --git a/modules/cache b/modules/cache
diff --git a/modules/codebench b/modules/codebench
diff --git a/modules/database b/modules/database
diff --git a/modules/image b/modules/image
diff --git a/modules/minion b/modules/minion
diff --git a/modules/orm b/modules/orm
diff --git a/modules/unittest b/modules/unittest
diff --git a/modules/userguide b/modules/userguide
diff --git a/system b/system
+1 −0		classes/Kohana/Database/MySQL.php
+37 −0		composer.json
+15 −0		guide/database/config.md
+2 −2		classes/Kohana/Minion/Exception.php
+33 −0		composer.json
+1 −30		guide/minion/setup.md
+2 −2		guide/minion/tasks.md
+0 −0		tests/minion/TaskTest.php
+4 −0		classes/Kohana/Auth/ORM.php
+11 −8		classes/Kohana/ORM.php
+34 −0		composer.json
+2 −2		classes/Kohana/Unittest/Database/TestCase.php
+5 −5		classes/Kohana/Unittest/TestCase.php
+34 −0		composer.json
+1 −1		classes/Kohana/Controller/Userguide.php
+33 −0		composer.json