From 96bd33b2edc1b0e6a04cb8e3bcf97e8c7b3adf3e Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 4 May 2011 01:30:36 +0100 Subject: Added Migration class and language file. --- application/config/migration.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'application') diff --git a/application/config/migration.php b/application/config/migration.php index 37b1b8534..509fd90ab 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 1; +$config['migration_version'] = 0; /* @@ -36,3 +36,7 @@ $config['migration_version'] = 1; | */ $config['migration_path'] = APPPATH . 'migrations/'; + + +/* End of file migration.php */ +/* Location: ./application/config/migration.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 3b9f88df882ee1af6fbc8ca4f299b1b229307895 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 20 May 2011 10:25:13 -0500 Subject: modified the 'use_set_names' variable in the MySQL/i drivers to be a class property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files --- application/config/database.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application') diff --git a/application/config/database.php b/application/config/database.php index e77bf97df..4bb7a5707 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -27,7 +27,8 @@ | ['char_set'] The character set used in communicating with the database | ['dbcollat'] The character collation used in communicating with the database | NOTE: For MySQL and MySQLi databases, this setting is only used -| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7. +| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7 +| (and in table creation queries made with DB Forge). | There is an incompatibility in PHP with mysql_real_escape_string() which | can make your site vulnerable to SQL injection if you are using a | multi-byte character set and are running versions lower than these. -- cgit v1.2.3-24-g4f1b From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 1 Jul 2011 17:56:50 -0500 Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance --- application/config/autoload.php | 22 ++++++++++---------- application/config/config.php | 40 ++++++++++++++++++------------------ application/config/constants.php | 6 +++--- application/config/database.php | 10 ++++----- application/config/foreign_chars.php | 2 +- application/config/hooks.php | 4 ++-- application/config/mimes.php | 8 ++++---- application/config/profiler.php | 2 +- application/config/routes.php | 2 +- application/config/smileys.php | 4 ++-- application/config/user_agents.php | 6 +++--- application/controllers/welcome.php | 4 ++-- application/errors/error_php.php | 2 +- 13 files changed, 56 insertions(+), 56 deletions(-) (limited to 'application') diff --git a/application/config/autoload.php b/application/config/autoload.php index 1c492a20d..53129c9c6 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -1,4 +1,4 @@ - 'application/mac-binhex40', 'tgz' => array('application/x-tar', 'application/x-gzip-compressed'), 'xhtml' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml', - 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), + 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'), 'mid' => 'audio/midi', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', @@ -71,7 +71,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), - 'png' => array('image/png', 'image/x-png'), + 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', 'css' => 'text/css', diff --git a/application/config/profiler.php b/application/config/profiler.php index b0f43b1d8..f8a5b1a1e 100644 --- a/application/config/profiler.php +++ b/application/config/profiler.php @@ -1,4 +1,4 @@ -A PHP Error was encountered

Severity:

-

Message:

+

Message:

Filename:

Line Number:

-- cgit v1.2.3-24-g4f1b From 62f04a6248ff5d6d76e94297e1f13b4d5960c2ec Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 10 Aug 2011 08:24:04 -0600 Subject: Disabled migrations by default. --- application/config/migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/config/migration.php b/application/config/migration.php index 509fd90ab..dba870010 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -9,7 +9,7 @@ | and disable it back when you're done. | */ -$config['migration_enabled'] = TRUE; +$config['migration_enabled'] = FALSE; /* -- cgit v1.2.3-24-g4f1b From 277c57c5c43a0f3ede09d679085485bc50c44b88 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 10 Aug 2011 09:00:13 -0600 Subject: Added application/x-csv as a mime. --- application/config/mimes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/config/mimes.php b/application/config/mimes.php index 8065794ff..82767d7c8 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -10,7 +10,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'cpt' => 'application/mac-compactpro', - 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), + 'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'), 'bin' => 'application/macbinary', 'dms' => 'application/octet-stream', 'lha' => 'application/octet-stream', -- cgit v1.2.3-24-g4f1b From e13aa67f3e8275d672dc08f21a3992e94bbe3038 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 7 Oct 2011 14:40:15 +0800 Subject: Fix #537 issue: replace new wav mimetype --- application/config/mimes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application') diff --git a/application/config/mimes.php b/application/config/mimes.php index 82767d7c8..f00e5b6ed 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -65,8 +65,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'rpm' => 'audio/x-pn-realaudio-plugin', 'ra' => 'audio/x-realaudio', 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', + 'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'), + 'bmp' => array('image/bmp', 'image/x-windows-bmp'), 'gif' => 'image/gif', 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), @@ -103,4 +103,4 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', /* End of file mimes.php */ -/* Location: ./application/config/mimes.php */ \ No newline at end of file +/* Location: ./application/config/mimes.php */ -- cgit v1.2.3-24-g4f1b From 5543fd7ba20a1ddc9bdd0fb9505c1de310e9b833 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Thu, 27 Oct 2011 01:55:56 +0100 Subject: Added long missing Migration documentation. --- application/config/migration.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'application') diff --git a/application/config/migration.php b/application/config/migration.php index dba870010..afa264562 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -4,9 +4,8 @@ | Enable/Disable Migrations |-------------------------------------------------------------------------- | -| Migrations are disabled by default for security reasons. -| You should enable migrations whenever you intend to do a schema migration -| and disable it back when you're done. +| Migrations are disabled by default but should be enabled +| whenever you intend to do a schema migration. | */ $config['migration_enabled'] = FALSE; -- cgit v1.2.3-24-g4f1b