Fixed conflicts.

6 files changed, 185 insertions, 165 deletions

diff --git a/application/config/mimes.php b/application/config/mimes.php
index ea0192574..c43f1fc2f 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -57,6 +57,7 @@ $mimes = array('hqx'	=>	array('application/mac-binhex40', 'application/mac-binhe
 				'mif'	=>	'application/vnd.mif',
 				'xls'	=>	array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
 				'ppt'	=>	array('application/powerpoint', 'application/vnd.ms-powerpoint'),
+				'pptx'	=> 	'application/vnd.openxmlformats-officedocument.presentationml.presentation',
 				'wbxml'	=>	'application/wbxml',
 				'wmlc'	=>	'application/wmlc',
 				'dcr'	=>	'application/x-director',
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 721ce413d..03cba9bc8 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -5,9 +5,9 @@
  * An open source application development framework for PHP 5.1.6 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Academic Free License version 3.0
- * 
+ *
  * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
@@ -37,173 +37,177 @@
 */
 
 $platforms = array (
-					'windows nt 6.1'	=> 'Windows 7',
-					'windows nt 6.0'	=> 'Windows Vista',
-					'windows nt 5.2'	=> 'Windows 2003',
-					'windows nt 5.1'	=> 'Windows XP',
-					'windows nt 5.0'	=> 'Windows 2000',
-					'windows nt 4.0'	=> 'Windows NT 4.0',
-					'winnt4.0'		=> 'Windows NT 4.0',
-					'winnt 4.0'		=> 'Windows NT',
-					'winnt'			=> 'Windows NT',
-					'windows 98'		=> 'Windows 98',
-					'win98'			=> 'Windows 98',
-					'windows 95'		=> 'Windows 95',
-					'win95'			=> 'Windows 95',
-					'windows'		=> 'Unknown Windows OS',
-					'os x'			=> 'Mac OS X',
-					'ppc mac'		=> 'Power PC Mac',
-					'freebsd'		=> 'FreeBSD',
-					'ppc'			=> 'Macintosh',
-					'linux'			=> 'Linux',
-					'debian'		=> 'Debian',
-					'sunos'			=> 'Sun Solaris',
-					'beos'			=> 'BeOS',
-					'apachebench'		=> 'ApacheBench',
-					'aix'			=> 'AIX',
-					'irix'			=> 'Irix',
-					'osf'			=> 'DEC OSF',
-					'hp-ux'			=> 'HP-UX',
-					'netbsd'		=> 'NetBSD',
-					'bsdi'			=> 'BSDi',
-					'openbsd'		=> 'OpenBSD',
-					'gnu'			=> 'GNU/Linux',
-					'unix'			=> 'Unknown Unix OS'
-				);
+	'windows nt 6.1'	=> 'Windows 7',
+	'windows nt 6.0'	=> 'Windows Vista',
+	'windows nt 5.2'	=> 'Windows 2003',
+	'windows nt 5.1'	=> 'Windows XP',
+	'windows nt 5.0'	=> 'Windows 2000',
+	'windows nt 4.0'	=> 'Windows NT 4.0',
+	'winnt4.0'			=> 'Windows NT 4.0',
+	'winnt 4.0'			=> 'Windows NT',
+	'winnt'				=> 'Windows NT',
+	'windows 98'		=> 'Windows 98',
+	'win98'				=> 'Windows 98',
+	'windows 95'		=> 'Windows 95',
+	'win95'				=> 'Windows 95',
+	'windows'			=> 'Unknown Windows OS',
+	'os x'				=> 'Mac OS X',
+	'ppc mac'			=> 'Power PC Mac',
+	'freebsd'			=> 'FreeBSD',
+	'ppc'				=> 'Macintosh',
+	'linux'				=> 'Linux',
+	'debian'			=> 'Debian',
+	'sunos'				=> 'Sun Solaris',
+	'beos'				=> 'BeOS',
+	'apachebench'		=> 'ApacheBench',
+	'aix'				=> 'AIX',
+	'irix'				=> 'Irix',
+	'osf'				=> 'DEC OSF',
+	'hp-ux'				=> 'HP-UX',
+	'netbsd'			=> 'NetBSD',
+	'bsdi'				=> 'BSDi',
+	'openbsd'			=> 'OpenBSD',
+	'gnu'				=> 'GNU/Linux',
+	'unix'				=> 'Unknown Unix OS'
+);
 
 
 // The order of this array should NOT be changed. Many browsers return
 // multiple browser types so we want to identify the sub-type first.
 $browsers = array(
-					'Flock'			=> 'Flock',
-					'Chrome'		=> 'Chrome',
-					'Opera'			=> 'Opera',
-					'MSIE'			=> 'Internet Explorer',
-					'Internet Explorer'	=> 'Internet Explorer',
-					'Shiira'		=> 'Shiira',
-					'Firefox'		=> 'Firefox',
-					'Chimera'		=> 'Chimera',
-					'Phoenix'		=> 'Phoenix',
-					'Firebird'		=> 'Firebird',
-					'Camino'		=> 'Camino',
-					'Netscape'		=> 'Netscape',
-					'OmniWeb'		=> 'OmniWeb',
-					'Safari'		=> 'Safari',
-					'Mozilla'		=> 'Mozilla',
-					'Konqueror'		=> 'Konqueror',
-					'icab'			=> 'iCab',
-					'Lynx'			=> 'Lynx',
-					'Links'			=> 'Links',
-					'hotjava'		=> 'HotJava',
-					'amaya'			=> 'Amaya',
-					'IBrowse'		=> 'IBrowse'
-				);
+	'Flock'			=> 'Flock',
+	'Chrome'		=> 'Chrome',
+	'Opera'			=> 'Opera',
+	'MSIE'			=> 'Internet Explorer',
+	'Internet Explorer'	=> 'Internet Explorer',
+	'Shiira'		=> 'Shiira',
+	'Firefox'		=> 'Firefox',
+	'Chimera'		=> 'Chimera',
+	'Phoenix'		=> 'Phoenix',
+	'Firebird'		=> 'Firebird',
+	'Camino'		=> 'Camino',
+	'Netscape'		=> 'Netscape',
+	'OmniWeb'		=> 'OmniWeb',
+	'Safari'		=> 'Safari',
+	'Mozilla'		=> 'Mozilla',
+	'Konqueror'		=> 'Konqueror',
+	'icab'			=> 'iCab',
+	'Lynx'			=> 'Lynx',
+	'Links'			=> 'Links',
+	'hotjava'		=> 'HotJava',
+	'amaya'			=> 'Amaya',
+	'IBrowse'		=> 'IBrowse'
+);
 
 $mobiles = array(
-					// legacy array, old values commented out
-					'mobileexplorer'	=> 'Mobile Explorer',
-//					'openwave'		=> 'Open Wave',
-//					'opera mini'		=> 'Opera Mini',
-//					'operamini'		=> 'Opera Mini',
-//					'elaine'		=> 'Palm',
-					'palmsource'		=> 'Palm',
-//					'digital paths'		=> 'Palm',
-//					'avantgo'		=> 'Avantgo',
-//					'xiino'			=> 'Xiino',
-					'palmscape'		=> 'Palmscape',
-//					'nokia'			=> 'Nokia',
-//					'ericsson'		=> 'Ericsson',
-//					'blackberry'		=> 'BlackBerry',
-//					'motorola'		=> 'Motorola'
+	// legacy array, old values commented out
+	'mobileexplorer'	=> 'Mobile Explorer',
+//  'openwave'			=> 'Open Wave',
+//	'opera mini'		=> 'Opera Mini',
+//	'operamini'			=> 'Opera Mini',
+//	'elaine'			=> 'Palm',
+	'palmsource'		=> 'Palm',
+//	'digital paths'		=> 'Palm',
+//	'avantgo'			=> 'Avantgo',
+//	'xiino'				=> 'Xiino',
+	'palmscape'			=> 'Palmscape',
+//	'nokia'				=> 'Nokia',
+//	'ericsson'			=> 'Ericsson',
+//	'blackberry'		=> 'BlackBerry',
+//	'motorola'			=> 'Motorola'
+
+	// Phones and Manufacturers
+	'motorola'		=> "Motorola",
+	'nokia'			=> "Nokia",
+	'palm'			=> "Palm",
+	'iphone'		=> "Apple iPhone",
+	'ipad'			=> "iPad",
+	'ipod'			=> "Apple iPod Touch",
+	'sony'			=> "Sony Ericsson",
+	'ericsson'		=> "Sony Ericsson",
+	'blackberry'	=> "BlackBerry",
+	'cocoon'		=> "O2 Cocoon",
+	'blazer'		=> "Treo",
+	'lg'			=> "LG",
+	'amoi'			=> "Amoi",
+	'xda'			=> "XDA",
+	'mda'			=> "MDA",
+	'vario'			=> "Vario",
+	'htc'			=> "HTC",
+	'samsung'		=> "Samsung",
+	'sharp'			=> "Sharp",
+	'sie-'			=> "Siemens",
+	'alcatel'		=> "Alcatel",
+	'benq'			=> "BenQ",
+	'ipaq'			=> "HP iPaq",
+	'mot-'			=> "Motorola",
+	'playstation portable'	=> "PlayStation Portable",
+	'hiptop'		=> "Danger Hiptop",
+	'nec-'			=> "NEC",
+	'panasonic'		=> "Panasonic",
+	'philips'		=> "Philips",
+	'sagem'			=> "Sagem",
+	'sanyo'			=> "Sanyo",
+	'spv'			=> "SPV",
+	'zte'			=> "ZTE",
+	'sendo'			=> "Sendo",
+	'dsi'			=> "Nintendo DSi",
+	'ds'			=> "Nintendo DS",
+	'wii'			=> "Nintendo Wii",
+	'3ds'			=> "Nintendo 3DS",
+	'open web'		=> "Open Web",
+	'openweb'		=> "OpenWeb",
 
-					// Phones and Manufacturers
-					'motorola'		=> "Motorola",
-					'nokia'			=> "Nokia",
-					'palm'			=> "Palm",
-					'iphone'		=> "Apple iPhone",
-					'ipad'			=> "iPad",
-					'ipod'			=> "Apple iPod Touch",
-					'sony'			=> "Sony Ericsson",
-					'ericsson'		=> "Sony Ericsson",
-					'blackberry'		=> "BlackBerry",
-					'cocoon'		=> "O2 Cocoon",
-					'blazer'		=> "Treo",
-					'lg'			=> "LG",
-					'amoi'			=> "Amoi",
-					'xda'			=> "XDA",
-					'mda'			=> "MDA",
-					'vario'			=> "Vario",
-					'htc'			=> "HTC",
-					'samsung'		=> "Samsung",
-					'sharp'			=> "Sharp",
-					'sie-'			=> "Siemens",
-					'alcatel'		=> "Alcatel",
-					'benq'			=> "BenQ",
-					'ipaq'			=> "HP iPaq",
-					'mot-'			=> "Motorola",
-					'playstation portable'	=> "PlayStation Portable",
-					'hiptop'		=> "Danger Hiptop",
-					'nec-'			=> "NEC",
-					'panasonic'		=> "Panasonic",
-					'philips'		=> "Philips",
-					'sagem'			=> "Sagem",
-					'sanyo'			=> "Sanyo",
-					'spv'			=> "SPV",
-					'zte'			=> "ZTE",
-					'sendo'			=> "Sendo",
-					'dsi'                   => "Nintendo DSi",
-                                        'ds'                    => "Nintendo DS",
-                                        'wii'                   => "Nintendo Wii",
-                                        '3ds'                   => "Nintendo 3DS",
-// Operating Systems
-					'android'		=> "Android",
-					'symbian'		=> "Symbian",
-					'SymbianOS'		=> "SymbianOS",
-					'elaine'		=> "Palm",
-					'palm'			=> "Palm",
-					'series60'		=> "Symbian S60",
-					'windows ce'		=> "Windows CE",
+	// Operating Systems
+	'android'		=> "Android",
+	'symbian'		=> "Symbian",
+	'SymbianOS'		=> "SymbianOS",
+	'elaine'		=> "Palm",
+	'palm'			=> "Palm",
+	'series60'		=> "Symbian S60",
+	'windows ce'	=> "Windows CE",
 
-					// Browsers
-					'obigo'			=> "Obigo",
-					'netfront'		=> "Netfront Browser",
-					'openwave'		=> "Openwave Browser",
-					'mobilexplorer'		=> "Mobile Explorer",
-					'operamini'		=> "Opera Mini",
-					'opera mini'		=> "Opera Mini",
+	// Browsers
+	'obigo'			=> "Obigo",
+	'netfront'		=> "Netfront Browser",
+	'openwave'		=> "Openwave Browser",
+	'mobilexplorer'	=> "Mobile Explorer",
+	'operamini'		=> "Opera Mini",
+	'opera mini'	=> "Opera Mini",
 
-					// Other
-					'digital paths'		=> "Digital Paths",
-					'avantgo'		=> "AvantGo",
-					'xiino'			=> "Xiino",
-					'novarra'		=> "Novarra Transcoder",
-					'vodafone'		=> "Vodafone",
-					'docomo'		=> "NTT DoCoMo",
-					'o2'			=> "O2",
+	// Other
+	'digital paths'	=> "Digital Paths",
+	'avantgo'		=> "AvantGo",
+	'xiino'			=> "Xiino",
+	'novarra'		=> "Novarra Transcoder",
+	'vodafone'		=> "Vodafone",
+	'docomo'		=> "NTT DoCoMo",
+	'o2'			=> "O2",
 
-					// Fallback
-					'mobile'		=> "Generic Mobile",
-					'wireless'		=> "Generic Mobile",
-					'j2me'			=> "Generic Mobile",
-					'midp'			=> "Generic Mobile",
-					'cldc'			=> "Generic Mobile",
-					'up.link'		=> "Generic Mobile",
-					'up.browser'		=> "Generic Mobile",
-					'smartphone'		=> "Generic Mobile",
-					'cellphone'		=> "Generic Mobile"
-				);
+	// Fallback
+	'mobile'		=> "Generic Mobile",
+	'wireless'		=> "Generic Mobile",
+	'j2me'			=> "Generic Mobile",
+	'midp'			=> "Generic Mobile",
+	'cldc'			=> "Generic Mobile",
+	'up.link'		=> "Generic Mobile",
+	'up.browser'	=> "Generic Mobile",
+	'smartphone'	=> "Generic Mobile",
+	'cellphone'		=> "Generic Mobile"
+);
 
 // There are hundreds of bots but these are the most common.
 $robots = array(
-					'googlebot'		=> 'Googlebot',
-					'msnbot'		=> 'MSNBot',
-					'slurp'			=> 'Inktomi Slurp',
-					'yahoo'			=> 'Yahoo',
-					'askjeeves'		=> 'AskJeeves',
-					'fastcrawler'		=> 'FastCrawler',
-					'infoseek'		=> 'InfoSeek Robot 1.0',
-					'lycos'			=> 'Lycos'
-				);
+	'googlebot'		=> 'Googlebot',
+	'msnbot'		=> 'MSNBot',
+	'bingbot'		=> 'Bing',
+	'slurp'			=> 'Inktomi Slurp',
+	'yahoo'			=> 'Yahoo',
+	'askjeeves'		=> 'AskJeeves',
+	'fastcrawler'	=> 'FastCrawler',
+	'infoseek'		=> 'InfoSeek Robot 1.0',
+	'lycos'			=> 'Lycos'
+);
 
 /* End of file user_agents.php */
-/* Location: ./application/config/user_agents.php */
\ No newline at end of file
+/* Location: ./application/config/user_agents.php */
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 447bf55ac..8c92fdc89 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -132,7 +132,7 @@ if ( ! function_exists('standard_date'))
 						'DATE_COOKIE'	=>	'%l, %d-%M-%y %H:%i:%s UTC',
 						'DATE_ISO8601'	=>	'%Y-%m-%dT%H:%i:%s%Q',
 						'DATE_RFC822'	=>	'%D, %d %M %y %H:%i:%s %O',
-						'DATE_RFC850'	=>	'%l, %d-%M-%y %H:%m:%i UTC',
+						'DATE_RFC850'	=>	'%l, %d-%M-%y %H:%i:%s UTC',
 						'DATE_RFC1036'	=>	'%D, %d %M %y %H:%i:%s %O',
 						'DATE_RFC1123'	=>	'%D, %d %M %Y %H:%i:%s %O',
 						'DATE_RSS'		=>	'%D, %d %M %Y %H:%i:%s %O',
diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index b7edf7195..233a901e4 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -252,7 +252,7 @@ class CI_Migration {
 	{
 		if ( ! $migrations = $this->find_migrations())
 		{
-			$this->_error_string = $this->line->lang('migration_none_found');
+			$this->_error_string = $this->lang->line('migration_none_found');
 			return false;
 		}
 
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 2f66ef09a..7b1e3fa6e 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1416,14 +1416,14 @@ class XML_RPC_Values extends CI_Xmlrpc
 	{
 		if ($utc == 1)
 		{
-			$t = strftime("%Y%m%dT%H:%M:%S", $time);
+			$t = strftime("%Y%m%dT%H:%i:%s", $time);
 		}
 		else
 		{
 			if (function_exists('gmstrftime'))
-				$t = gmstrftime("%Y%m%dT%H:%M:%S", $time);
+				$t = gmstrftime("%Y%m%dT%H:%i:%s", $time);
 			else
-				$t = strftime("%Y%m%dT%H:%M:%S", $time - date('Z'));
+				$t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z'));
 		}
 		return $t;
 	}
diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 64adc3047..a834cc0f7 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -57,7 +57,19 @@ file.
 To connect manually to a desired database you can pass an array of
 values::
 
-	$config['hostname'] = "localhost"; $config['username'] = "myusername"; $config['password'] = "mypassword"; $config['database'] = "mydatabase"; $config['dbdriver'] = "mysql"; $config['dbprefix'] = ""; $config['pconnect'] = FALSE; $config['db_debug'] = TRUE; $config['cache_on'] = FALSE; $config['cachedir'] = ""; $config['char_set'] = "utf8"; $config['dbcollat'] = "utf8_general_ci";  $this->load->database($config);
+	$config['hostname'] = "localhost"; 
+	$config['username'] = "myusername"; 
+	$config['password'] = "mypassword"; 
+	$config['database'] = "mydatabase"; 
+	$config['dbdriver'] = "mysql"; 
+	$config['dbprefix'] = ""; 
+	$config['pconnect'] = FALSE; 
+	$config['db_debug'] = TRUE; 
+	$config['cache_on'] = FALSE; 
+	$config['cachedir'] = ""; 
+	$config['char_set'] = "utf8"; 
+	$config['dbcollat'] = "utf8_general_ci";  
+	$this->load->database($config);
 
 For information on each of these values please see the :doc:`configuration
 page <configuration>`.
@@ -68,14 +80,16 @@ page <configuration>`.
 Or you can submit your database values as a Data Source Name. DSNs must
 have this prototype::
 
-	$dsn = 'dbdriver://username:password@hostname/database';  $this->load->database($dsn);
+	$dsn = 'dbdriver://username:password@hostname/database';  
+	$this->load->database($dsn);
 
 To override default config values when connecting with a DSN string, add
 the config variables as a query string.
 
 ::
 
-	$dsn = 'dbdriver://username:password@hostname/database?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=/path/to/cache';  $this->load->database($dsn);
+	$dsn = 'dbdriver://username:password@hostname/database?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=/path/to/cache';  
+	$this->load->database($dsn);
 
 Connecting to Multiple Databases
 ================================
@@ -83,7 +97,8 @@ Connecting to Multiple Databases
 If you need to connect to more than one database simultaneously you can
 do so as follows::
 
-	$DB1 = $this->load->database('group_one', TRUE); $DB2 = $this->load->database('group_two', TRUE);
+	$DB1 = $this->load->database('group_one', TRUE); 
+	$DB2 = $this->load->database('group_two', TRUE);
 
 Note: Change the words "group_one" and "group_two" to the specific
 group names you are connecting to (or you can pass the connection values