From 5025929d76172efd6dd3a7b0f4da7611a3df9391 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Fri, 15 Jul 2011 15:25:15 -0600
Subject: Fixed conflicted changelog.
---
user_guide/changelog.html | 2 ++
user_guide/database/queries.html | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index c1ee37fc5..95270febc 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,8 @@ Change Log
Libraries
- Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
+ - Added is_unique to the Form Validation library.
+ - Added $this->db->set_dbprefix() to the Database Driver.
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index f9f96803f..4c1ddfe7d 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -80,11 +80,16 @@ It DOES NOT return a database result set, nor does it set the query timer, or co
It simply lets you submit a query. Most users will rarely use this function.
-Adding Database prefixes manually
-If you have configured a database prefix and would like to add it in manually for, you can use the following.
+Working with Database prefixes manually
+If you have configured a database prefix and would like to prepend it to a table name for use in a native SQL query for example, then you can use the following:
$this->db->dbprefix('tablename');
// outputs prefix_tablename
+If for any reason you would like to change the prefix programatically without needing to create a new connection, you can use this method:
+$this->db->set_dbprefix('newprefix');
+$this->db->dbprefix('tablename');
+// outputs newprefix_tablename
+
Protecting identifiers
In many databases it is advisable to protect table and field names - for example with backticks in MySQL. Active Record queries are automatically protected, however if you need to manually protect an identifier you can use:
--
cgit v1.2.3-24-g4f1b
From e0df07950b101316c07ccec882ae00f930bca0c6 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Fri, 22 Jul 2011 16:11:34 -0600
Subject: Fixed conflict in changelog.
---
user_guide/changelog.html | 2 ++
user_guide/libraries/loader.html | 6 ++++++
2 files changed, 8 insertions(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 95270febc..81307fe0b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -86,6 +86,8 @@ Change Log
Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
Added is_unique to the Form Validation library.
Added $this->db->set_dbprefix() to the Database Driver.
+ Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
+ Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 1d93af5ed..a472730ca 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -175,6 +175,12 @@ and merged into one array for conversion to variables.
+$this->load->get_var($key)
+
+This function checks the associative array of variables available to your views. This is useful if for any reason a var is set in a library or another controller method using $this->load->vars().
+
+
+
$this->load->helper('file_name')
This function loads helper files, where file_name is the name of the file, without the _helper.php extension.
--
cgit v1.2.3-24-g4f1b
From e9ebe463e42d4ab7f7d29f85c87b3f24004a64b8 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Sat, 13 Aug 2011 11:23:04 -0600
Subject: Added note for fixed issue #199 in changelog.
---
user_guide/changelog.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 81307fe0b..d2654c44b 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -73,7 +73,7 @@ Change Log
Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
Removed internal usage of the EXT constant.
Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
- Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
+ Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
Helpers
@@ -100,6 +100,7 @@ Change Log
Fixed a bug (Reactor #231) where Sessions Library database table example SQL did not contain an index on last_activity. See Upgrade Notes.
Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
+ Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
Version 2.0.2
--
cgit v1.2.3-24-g4f1b
From 32ad584b25b6429b2e4ce2f38177e88a12f2b117 Mon Sep 17 00:00:00 2001
From: Adam Jackett
Date: Sat, 23 Jul 2011 14:35:47 -0400
Subject: Added having() fix to changelog.
---
user_guide/changelog.html | 1 +
1 file changed, 1 insertion(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d2654c44b..7779a690d 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -88,6 +88,7 @@ Change Log
Added $this->db->set_dbprefix() to the Database Driver.
Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
+ Changed $this->db->having() to insert quotes using escape() rather than escape_str().
--
cgit v1.2.3-24-g4f1b
From 090eb6075eac3a16974f6baed236875ee1dc8a90 Mon Sep 17 00:00:00 2001
From: Adam Jackett
Date: Sat, 23 Jul 2011 11:53:02 -0400
Subject: Merge changelog.
---
user_guide/changelog.html | 2 ++
1 file changed, 2 insertions(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 7779a690d..f5eb53aa3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -102,6 +102,8 @@ Change Log
Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
+ Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
+ Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
Version 2.0.2
--
cgit v1.2.3-24-g4f1b
From 76e621786007907192c3e84cbde3e1a12dbf83fb Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Tue, 9 Aug 2011 16:03:49 -0600
Subject: Fixed conflict in changelog.
---
user_guide/changelog.html | 1 +
1 file changed, 1 insertion(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index f5eb53aa3..e6c1425af 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -104,6 +104,7 @@ Change Log
Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
+ Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
Version 2.0.2
--
cgit v1.2.3-24-g4f1b
From fe1d45a023b08753f4c5f1d908d54ae842277558 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Sat, 13 Aug 2011 11:06:57 -0600
Subject: Fixed conflicts.
---
user_guide/changelog.html | 1 +
1 file changed, 1 insertion(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index e6c1425af..9bebb7044 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -105,6 +105,7 @@ Change Log
Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
+ Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.
Version 2.0.2
--
cgit v1.2.3-24-g4f1b
From dd9b763ef18808637680237d78d8698799ccf8fa Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Wed, 10 Aug 2011 09:00:13 -0600
Subject: Fixed conflicts.
---
user_guide/changelog.html | 2 ++
1 file changed, 2 insertions(+)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 9bebb7044..783c9d3d1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -74,6 +74,8 @@ Change Log
Removed internal usage of the EXT constant.
Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
+ Added "application/x-csv" to mimes.php.
+
Helpers
--
cgit v1.2.3-24-g4f1b
From 9d887b32a1fe998cbb0307a5e678ac3ba5076a1e Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Wed, 10 Aug 2011 08:06:37 -0600
Subject: Fixed conflicts in changelog.
---
user_guide/changelog.html | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 783c9d3d1..5d5767b74 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,7 +75,7 @@ Change Log
Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
Added "application/x-csv" to mimes.php.
-
+ Fixed a bug where Email library attachments with a "." in the name would using invalid MIME-types.
Helpers
@@ -105,9 +105,15 @@ Change Log
Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
+<<<<<<< HEAD
Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.
+=======
+ Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
+ Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
+ Fixed a bug where Email library attachments with a "." in the name would using invalid MIME-types.
+>>>>>>> 0aaf42b... Fixed a bug where Email library attachments with a . in the name would using invalid MIME-types.
Version 2.0.2
--
cgit v1.2.3-24-g4f1b
From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
markers found in the change log
---
user_guide/changelog.html | 10 ++--------
user_guide/database/active_record.html | 2 +-
user_guide/database/caching.html | 2 +-
user_guide/database/call_function.html | 2 +-
user_guide/database/configuration.html | 2 +-
user_guide/database/connecting.html | 2 +-
user_guide/database/examples.html | 2 +-
user_guide/database/fields.html | 2 +-
user_guide/database/forge.html | 2 +-
user_guide/database/helpers.html | 2 +-
user_guide/database/index.html | 2 +-
user_guide/database/queries.html | 2 +-
user_guide/database/results.html | 2 +-
user_guide/database/table_data.html | 2 +-
user_guide/database/transactions.html | 2 +-
user_guide/database/utilities.html | 2 +-
user_guide/doc_style/index.html | 2 +-
user_guide/general/alternative_php.html | 2 +-
user_guide/general/ancillary_classes.html | 2 +-
user_guide/general/autoloader.html | 2 +-
user_guide/general/caching.html | 2 +-
user_guide/general/cli.html | 2 +-
user_guide/general/common_functions.html | 2 +-
user_guide/general/controllers.html | 2 +-
user_guide/general/core_classes.html | 2 +-
user_guide/general/creating_drivers.html | 2 +-
user_guide/general/creating_libraries.html | 2 +-
user_guide/general/credits.html | 2 +-
user_guide/general/drivers.html | 2 +-
user_guide/general/environments.html | 2 +-
user_guide/general/errors.html | 2 +-
user_guide/general/helpers.html | 2 +-
user_guide/general/hooks.html | 2 +-
user_guide/general/libraries.html | 2 +-
user_guide/general/managing_apps.html | 2 +-
user_guide/general/models.html | 2 +-
user_guide/general/profiling.html | 2 +-
user_guide/general/quick_reference.html | 2 +-
user_guide/general/requirements.html | 2 +-
user_guide/general/reserved_names.html | 2 +-
user_guide/general/routing.html | 2 +-
user_guide/general/security.html | 2 +-
user_guide/general/styleguide.html | 2 +-
user_guide/general/urls.html | 2 +-
user_guide/general/views.html | 2 +-
user_guide/helpers/array_helper.html | 2 +-
user_guide/helpers/captcha_helper.html | 2 +-
user_guide/helpers/cookie_helper.html | 2 +-
user_guide/helpers/date_helper.html | 2 +-
user_guide/helpers/directory_helper.html | 2 +-
user_guide/helpers/download_helper.html | 2 +-
user_guide/helpers/email_helper.html | 2 +-
user_guide/helpers/file_helper.html | 2 +-
user_guide/helpers/form_helper.html | 2 +-
user_guide/helpers/html_helper.html | 2 +-
user_guide/helpers/inflector_helper.html | 2 +-
user_guide/helpers/language_helper.html | 2 +-
user_guide/helpers/number_helper.html | 2 +-
user_guide/helpers/path_helper.html | 2 +-
user_guide/helpers/security_helper.html | 2 +-
user_guide/helpers/smiley_helper.html | 2 +-
user_guide/helpers/string_helper.html | 2 +-
user_guide/helpers/text_helper.html | 2 +-
user_guide/helpers/typography_helper.html | 2 +-
user_guide/helpers/xml_helper.html | 2 +-
user_guide/index.html | 2 +-
user_guide/installation/downloads.html | 2 +-
user_guide/installation/index.html | 2 +-
user_guide/installation/troubleshooting.html | 2 +-
user_guide/installation/upgrade_120.html | 2 +-
user_guide/installation/upgrade_130.html | 2 +-
user_guide/installation/upgrade_131.html | 2 +-
user_guide/installation/upgrade_132.html | 2 +-
user_guide/installation/upgrade_133.html | 2 +-
user_guide/installation/upgrade_140.html | 2 +-
user_guide/installation/upgrade_141.html | 2 +-
user_guide/installation/upgrade_150.html | 2 +-
user_guide/installation/upgrade_152.html | 2 +-
user_guide/installation/upgrade_153.html | 2 +-
user_guide/installation/upgrade_154.html | 2 +-
user_guide/installation/upgrade_160.html | 2 +-
user_guide/installation/upgrade_161.html | 2 +-
user_guide/installation/upgrade_162.html | 2 +-
user_guide/installation/upgrade_163.html | 2 +-
user_guide/installation/upgrade_170.html | 2 +-
user_guide/installation/upgrade_171.html | 2 +-
user_guide/installation/upgrade_172.html | 2 +-
user_guide/installation/upgrade_200.html | 2 +-
user_guide/installation/upgrade_201.html | 2 +-
user_guide/installation/upgrade_202.html | 2 +-
user_guide/installation/upgrade_b11.html | 2 +-
user_guide/installation/upgrading.html | 2 +-
user_guide/libraries/benchmark.html | 2 +-
user_guide/libraries/caching.html | 2 +-
user_guide/libraries/calendar.html | 2 +-
user_guide/libraries/cart.html | 2 +-
user_guide/libraries/config.html | 2 +-
user_guide/libraries/email.html | 2 +-
user_guide/libraries/encryption.html | 2 +-
user_guide/libraries/file_uploading.html | 2 +-
user_guide/libraries/form_validation.html | 2 +-
user_guide/libraries/ftp.html | 2 +-
user_guide/libraries/image_lib.html | 2 +-
user_guide/libraries/input.html | 2 +-
user_guide/libraries/javascript.html | 2 +-
user_guide/libraries/language.html | 2 +-
user_guide/libraries/loader.html | 2 +-
user_guide/libraries/output.html | 2 +-
user_guide/libraries/pagination.html | 2 +-
user_guide/libraries/parser.html | 2 +-
user_guide/libraries/security.html | 2 +-
user_guide/libraries/sessions.html | 2 +-
user_guide/libraries/table.html | 2 +-
user_guide/libraries/trackback.html | 2 +-
user_guide/libraries/typography.html | 2 +-
user_guide/libraries/unit_testing.html | 2 +-
user_guide/libraries/uri.html | 2 +-
user_guide/libraries/user_agent.html | 2 +-
user_guide/libraries/xmlrpc.html | 2 +-
user_guide/libraries/zip.html | 2 +-
user_guide/license.html | 2 +-
user_guide/overview/appflow.html | 2 +-
user_guide/overview/at_a_glance.html | 2 +-
user_guide/overview/cheatsheets.html | 2 +-
user_guide/overview/features.html | 2 +-
user_guide/overview/getting_started.html | 2 +-
user_guide/overview/goals.html | 2 +-
user_guide/overview/index.html | 2 +-
user_guide/overview/mvc.html | 2 +-
user_guide/toc.html | 2 +-
130 files changed, 131 insertions(+), 137 deletions(-)
(limited to 'user_guide')
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 5d5767b74..c52a33e5a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -28,7 +28,7 @@