Merge branch '3.1-stable' into develop

Conflicts resolved:
	.travis.yml
	system/core/CodeIgniter.php
	system/database/drivers/oci8/oci8_forge.php
	system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
	system/helpers/path_helper.php
	system/libraries/Email.php
	user_guide_src/source/changelog.rst
	user_guide_src/source/conf.py
	user_guide_src/source/contributing/index.rst
	user_guide_src/source/general/requirements.rst
	user_guide_src/source/general/styleguide.rst
	user_guide_src/source/installation/downloads.rst
	user_guide_src/source/installation/upgrade_310.rst
	user_guide_src/source/installation/upgrading.rst

1 files changed, 3 insertions, 0 deletions

diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 8262beb6b..46a3b2185 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -178,6 +178,9 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
 				$attributes['TYPE'] = 'INTEGER';
 				$attributes['UNSIGNED'] = FALSE;
 				return;
+			case 'LONGTEXT':
+				$attributes['TYPE'] = 'STRING';
+				return;
 			default: return;
 		}
 	}