From f2d4eb599b52089989073b7c9a2c54df85732c66 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Wed, 31 Aug 2011 10:52:08 -0300 Subject: Added Sessions 'user_data' field bug fix item to log. --- 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 978b710be..c203746b8 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -118,6 +118,7 @@ Change Log
  • Fixed a bug (#8) - load_class() now looks for core classes in APPPATH first, allowing them to be replaced.
  • Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().
  • Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.
    • +
  • Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session.

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 9d9ab3ad2cba4d369cd5a10b5fe675b31cc66480 Mon Sep 17 00:00:00 2001 From: Stolz Date: Wed, 31 Aug 2011 19:22:36 +0200 Subject: Added missing profiler section (session_data) --- user_guide/general/profiling.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide') diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 9895b0284..0993da5b4 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -154,6 +154,11 @@ This information can be useful during development in order to help with debuggin The URI of the current request TRUE + + session_data + Data stored in current session + TRUE + query_toggle_count The number of queries after which the query block will default to hidden. -- cgit v1.2.3-24-g4f1b From c93ec88bedc8103095bcdd8f0e2ea2308ee0aa3f Mon Sep 17 00:00:00 2001 From: mmestrovic Date: Thu, 1 Sep 2011 03:24:08 +0300 Subject: Added reference for CUBRID database as supported in CI. --- user_guide/general/requirements.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html index 405798f04..de0ee76dd 100644 --- a/user_guide/general/requirements.html +++ b/user_guide/general/requirements.html @@ -59,7 +59,7 @@ Server Requirements
    • PHP version 5.1.6 or newer.
      • -
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, and ODBC.
      • +
    • A Database is required for most web application programming. Current supported databases are MySQL (4.1+), MySQLi, MS SQL, Postgres, Oracle, SQLite, ODBC and CUBRID.
    -- cgit v1.2.3-24-g4f1b From bf54e300e19c8e207ac2cb92e33b1c7f7debb66b Mon Sep 17 00:00:00 2001 From: mmestrovic Date: Thu, 1 Sep 2011 03:30:43 +0300 Subject: Updated download links for current and older versions. --- user_guide/installation/downloads.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index f36b2bc0f..539fbc170 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -58,7 +58,9 @@ Downloading CodeIgniter

    Downloading CodeIgniter

      -
    • CodeIgniter V 2.0.2 (Current version)
      • +
    • CodeIgniter V 2.1.0 (Current version)
      • +
    • CodeIgniter V 2.0.3
      • +
    • CodeIgniter V 2.0.2
    • CodeIgniter V 2.0.1
    • CodeIgniter V 2.0.0
    • CodeIgniter V 1.7.3
      • -- cgit v1.2.3-24-g4f1b From 11c5f1654d2d13113ad06da46f560628d7e31dd3 Mon Sep 17 00:00:00 2001 From: Aaron Kuzemchak Date: Sat, 3 Sep 2011 20:59:07 -0400 Subject: Enables real page numbers for URI segment in Pagination library --- user_guide/libraries/pagination.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 196555441..6a144114d 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -119,7 +119,11 @@ something different you can specify it.

      The number of "digit" links you would like before and after the selected page number. For example, the number 2 will place two digits on either side, as in the example links at the very top of this page.

      -

      $config['page_query_string'] = TRUE

      + +

      $config['use_page_numbers'] = TRUE;

      +

      By default, the URI segment will use the starting index for the items you are paginating. If you prefer to show the the actual page number, set this to TRUE.

      + +

      $config['page_query_string'] = TRUE;

      By default, the pagination library assume you are using URI Segments, and constructs your links something like

      http://example.com/index.php/test/page/20

      If you have $config['enable_query_strings'] set to TRUE your links will automatically be re-written using Query Strings. This option can also be explictly set. Using $config['page_query_string'] set to TRUE, the pagination link will become.

      -- cgit v1.2.3-24-g4f1b From e3f33942387909350d15adb1fa87d926fd5d8d03 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sun, 4 Sep 2011 13:55:28 +0100 Subject: Removed reference is IS_CLI in the documentation, which should have been $this->input->is_cli_request() --- user_guide/general/cli.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index befc9994a..222a77c9d 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -83,7 +83,7 @@ Running via the CLI
      • Run your cron-jobs without needing to use wget or curl
        • -
      • Make your cron-jobs inaccessible from being loaded in the URL by checking for IS_CLI
        • +
      • Make your cron-jobs inaccessible from being loaded in the URL by checking for $this->input->is_cli_request()
      • Make interactive "tasks" that can do things like set permissions, prune cache folders, run backups, etc.
      • Integrate with other applications in other languages. For example, a random C++ script could call one command and run code in your models!
      -- cgit v1.2.3-24-g4f1b From 40d1a7684444f6a8eb4cda23d8822f0b258f0c3e Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sun, 4 Sep 2011 13:57:52 +0100 Subject: Fixed incorrectly named variables in the documentation. --- user_guide/database/results.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide') diff --git a/user_guide/database/results.html b/user_guide/database/results.html index ec5f97762..a47e335cb 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -105,8 +105,8 @@ Query Results
      foreach ($query->result('User') as $user)
      {
      -    echo $row->name; // call attributes
      -    echo $row->reverse_name(); // or methods defined on the 'User' class
      +    echo $user->name; // call attributes
      +    echo $user->reverse_name(); // or methods defined on the 'User' class
      } -- cgit v1.2.3-24-g4f1b From 8ed8192269cbaa7c8d47fc0608ca6169c4c9f237 Mon Sep 17 00:00:00 2001 From: genio Date: Tue, 6 Sep 2011 15:44:43 -0300 Subject: A few examples had http:/example.com instead of http://example.com --- user_guide/helpers/form_helper.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'user_guide') diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index dd935ebd9..0afe0eb53 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -84,7 +84,7 @@ in the event your URLs ever change.

      The above example would create a form that points to your base URL plus the "email/send" URI segments, like this:

      -<form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send" /> +<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" />

      Adding Attributes

      @@ -97,7 +97,7 @@ echo form_open('email/send', $attributes);

      The above example would create a form similar to this:

      -<form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send"  class="email"  id="myform" /> +<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send"  class="email"  id="myform" />

      Adding Hidden Input Fields

      @@ -110,7 +110,7 @@ echo form_open('email/send', '', $hidden);

      The above example would create a form similar to this:

      -<form method="post" accept-charset="utf-8" action="http:/example.com/index.php/email/send">
      +<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send">
      <input type="hidden" name="username" value="Joe" />
      <input type="hidden" name="member_id" value="234" />       -- cgit v1.2.3-24-g4f1b From c394dbd01d3dfc75357379077d673926118b2ef8 Mon Sep 17 00:00:00 2001 From: genio Date: Tue, 6 Sep 2011 15:48:17 -0300 Subject: added the change to form_helper documentation to the change list --- 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 fb6e4493a..cee8cc52a 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,8 +75,9 @@ Change Log
    • Helpers
      • Added increment_string() to String Helper to turn "foo" into "foo-1" or "foo-1" into "foo-2".
        • -
      • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
        • +
      • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
      • url_title() will now trim extra dashes from beginning and end.
        • +
      • Fixed a couple of typos in the Form Helper documentation.
    • Database -- cgit v1.2.3-24-g4f1b From ec952d6694781140bbf95a589305d6a11e6a721e Mon Sep 17 00:00:00 2001 From: genio Date: Tue, 6 Sep 2011 16:54:37 -0300 Subject: took out the changelog on the typo --- user_guide/changelog.html | 1 - 1 file changed, 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index cee8cc52a..d9f28e96d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,7 +77,6 @@ Change Log
    • Added increment_string() to String Helper to turn "foo" into "foo-1" or "foo-1" into "foo-2".
    • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
    • url_title() will now trim extra dashes from beginning and end.
      • -
    • Fixed a couple of typos in the Form Helper documentation.
  • Database -- cgit v1.2.3-24-g4f1b From 5feb8bb8c89875224049a44ae988500c532ed6d4 Mon Sep 17 00:00:00 2001 From: druu Date: Tue, 6 Sep 2011 22:18:26 +0200 Subject: Added changelog entry --- 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 fb6e4493a..cdbbe6bda 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -77,6 +77,7 @@ Change Log
  • Added increment_string() to String Helper to turn "foo" into "foo-1" or "foo-1" into "foo-2".
  • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
  • url_title() will now trim extra dashes from beginning and end.
    • +
  • Improved speed of String Helper's random_string() method
  • Database -- cgit v1.2.3-24-g4f1b From 018af7a82749cb5c6d224940ab5f08d801f54988 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 7 Sep 2011 12:07:35 -0400 Subject: Added changelog item, updated since version file headers --- 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 fb6e4493a..5f0276137 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,7 @@ Change Log
  • Database
    • Added a CUBRID driver to the Database Driver. Thanks to the CUBRID team for supplying this patch.
      • +
    • Added a PDO driver to the Database Driver.
    • Typecast limit and offset in the Database Driver to integers to avoid possible injection.
    • Added additional option 'none' for the optional third argument for $this->db->like() in the Database Driver. -- cgit v1.2.3-24-g4f1b From 2b11da4141140244431ce4010ac506160516cdfd Mon Sep 17 00:00:00 2001 From: purwandi Date: Thu, 8 Sep 2011 19:05:29 +0700 Subject: Modified repo from mercurial to git on User Guide --- user_guide/installation/downloads.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'user_guide') diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index 539fbc170..b1b315958 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -88,14 +88,14 @@ Downloading CodeIgniter -

      Mercurial Server

      -

      Mercurial is a distributed version control system.

      +

      Git Server

      +

      Git is a distributed version control system.

      -

      Public Hg access is available at BitBucket. +

      Public Git access is available at Github. Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken from the tip.

      -

      Beginning with version 1.6.1, stable tags are also available via BitBucket, simply select the version from the Tags dropdown.

      +

      Beginning with version 2.0.3, stable tags are also available via Github, simply select the version from the Tags dropdown.

      -- cgit v1.2.3-24-g4f1b From a1f3175a39caabf8983b778b1e00d076e00f537b Mon Sep 17 00:00:00 2001 From: purwandi Date: Thu, 8 Sep 2011 19:40:32 +0700 Subject: Fix some typo --- user_guide/installation/downloads.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide') diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html index b1b315958..bb18f1de2 100644 --- a/user_guide/installation/downloads.html +++ b/user_guide/installation/downloads.html @@ -91,11 +91,11 @@ Downloading CodeIgniter

      Git Server

      Git is a distributed version control system.

      -

      Public Git access is available at Github. +

      Public Git access is available at GitHub. Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken from the tip.

      -

      Beginning with version 2.0.3, stable tags are also available via Github, simply select the version from the Tags dropdown.

      +

      Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.

      -- cgit v1.2.3-24-g4f1b From 0aaaeb071f9c5e795e5d3a39888c23cba5e8e738 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 9 Sep 2011 15:40:29 +0900 Subject: fix the variable name of system folder in user_guide/installation/index.html --- user_guide/installation/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'user_guide') diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index 84338e2e6..ad66ad7a6 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -67,14 +67,14 @@ Installation Instructions

      If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system and application folders -to something more private. If you do rename them, you must open your main index.php file and set the $system_folder and $application_folder +to something more private. If you do rename them, you must open your main index.php file and set the $system_path and $application_folder variables at the top of the file with the new name you've chosen.

      For the best security, both the system and any application folders should be placed above web root so that they are not directly accessible via a browser. By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.

      If you would like to keep your views public it is also possible to move the views folder out of your application folder.

      -

      After moving them, open your main index.php file and set the $system_folder, $application_folder and $view_folder variables, preferably with a full path, e.g. '/www/MyUser/system'.

      +

      After moving them, open your main index.php file and set the $system_path, $application_folder and $view_folder variables, preferably with a full path, e.g. '/www/MyUser/system'.

      One additional measure to take in production environments is to disable @@ -107,4 +107,4 @@ Next Topic:  Upgrading from a Previous Versio - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From 68ee3db9defd9d3ec8b3b97e768863fd62c7cb6e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 9 Sep 2011 15:44:05 +0900 Subject: fix typo of HTML tags in user_guide/changelog.html --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 005237e20..7d79b4d22 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -179,7 +179,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.
      • +
    • 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.
    -- cgit v1.2.3-24-g4f1b From 911724f19a662ff0039c768b33818282533c41be Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 9 Sep 2011 15:46:24 +0900 Subject: fix changelog.html, correct the location of added mime types The addition is not in 2.0.3, but in 2.1.0 fix to https://github.com/EllisLab/CodeIgniter/commit/0ba26c731cf8838b5239c1a7957bc18f58fe2f7d#user_guide/changelog.html --- user_guide/changelog.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7d79b4d22..3b4c72b4c 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,10 @@ Change Log
  • Callback validation rules can now accept parameters like any other validation rule.
  • Ability to log certain error types, not all under a threshold.
  • Added html_escape() to Common functions to escape HTML output for preventing XSS.
    • +
  • Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php.
    • +
  • Added support pgp,gpg to mimes.php.
    • +
  • Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    • +
  • Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
  • Helpers @@ -143,11 +147,6 @@ Change Log
  • Added "application/x-csv" to mimes.php.
  • Added CSRF protection URI whitelisting.
  • Fixed a bug where Email library attachments with a "." in the name would using invalid MIME-types.
    • -
  • Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php.
    • -
  • Added support pgp,gpg to mimes.php.
    • -
  • Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    • -
  • Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    • -
  • Helpers -- cgit v1.2.3-24-g4f1b From 8c50c8e960e1549fc6168c60bbf6f179c80db2eb Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 9 Sep 2011 12:11:21 -0300 Subject: Documented an un-documented feature, the 'enclosures' parameter, to the documentation for DB Util's result_to_csv() method. --- user_guide/database/utilities.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'user_guide') diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 8231c7e78..570e44713 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -183,14 +183,15 @@ $query = $this->db->query("SELECT * FROM mytable");
    echo $this->dbutil->csv_from_result($query);     -

    The second and third parameters allows you to -set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:

    +

    The second, third, and fourth parameters allow you to +set the delimiter, newline, enclosure characters, respectively. By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure. Example:

    $delimiter = ",";
    $newline = "\r\n";
    +$enclosure = '"';

    -echo $this->dbutil->csv_from_result($query, $delimiter, $newline); +echo $this->dbutil->csv_from_result($query, $delimiter, $newline, $enclosure);

    Important:  This function will NOT write the CSV file for you. It simply creates the CSV layout. -- cgit v1.2.3-24-g4f1b From 07f8fb3261c820d59019e21aa8ae29f9872cdb30 Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 9 Sep 2011 12:15:52 -0300 Subject: Forgot an 'and'... --- user_guide/database/utilities.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 570e44713..c80e3d106 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -184,7 +184,7 @@ echo $this->dbutil->csv_from_result($query);

    The second, third, and fourth parameters allow you to -set the delimiter, newline, enclosure characters, respectively. By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure. Example:

    +set the delimiter, newline, and enclosure characters respectively. By default tabs are used as the delimiter, "\n" is used as a new line, and a double-quote is used as the enclosure. Example:

    $delimiter = ",";
    -- cgit v1.2.3-24-g4f1b From 61bb5012ba51ebbe5af11ef9d21741474f9f970d Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 11 Sep 2011 14:35:52 +0800 Subject: update user guide for replacing 'br/' with 'br /' --- user_guide/database/active_record.html | 6 +++--- user_guide/general/cli.html | 4 ++-- user_guide/helpers/string_helper.html | 8 ++++---- user_guide/installation/upgrade_201.html | 4 ++-- user_guide/libraries/output.html | 14 +++++++------- user_guide/libraries/user_agent.html | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'user_guide') diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 0f09e78c3..10259a4af 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -530,7 +530,7 @@ $this->db->insert('mytable', $object); array or an object to the function. Here is an example using an array:

    -$data = array(
    +$data = array(
       array(
          'title' => 'My title' ,
          'name' => 'My Name' ,
    @@ -540,7 +540,7 @@ $data = array(
          'title' => 'Another title' ,
          'name' => 'Another Name' ,
          'date' => 'Another date'
    -   )
    +   )
    );

    $this->db->update_batch('mytable', $data); @@ -783,4 +783,4 @@ Next Topic:  Transactions - \ No newline at end of file + diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 222a77c9d..4e9bf8709 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -114,7 +114,7 @@ class Tools extends CI_Controller {

    Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.

    - $ cd /path/to/project;
    + $ cd /path/to/project;
    $ php index.php tools message
    @@ -147,4 +147,4 @@ Next Topic:  Reserved Names

    - \ No newline at end of file + diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 314124037..ebdbd3ab2 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -96,9 +96,9 @@ String Helper

    Usage example:

    -echo increment_string('file', '_'); // "file_1"
    -echo increment_string('file', '-', 2); // "file-2"
    -echo increment_string('file-4'); // "file-5"
     +echo increment_string('file', '_'); // "file_1"
    +echo increment_string('file', '-', 2); // "file-2"
    +echo increment_string('file-4'); // "file-5"

    alternator()

    @@ -186,4 +186,4 @@ Next Topic:  Text Helper - \ No newline at end of file + diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html index 036ef7c05..7ae29b824 100644 --- a/user_guide/installation/upgrade_201.html +++ b/user_guide/installation/upgrade_201.html @@ -83,7 +83,7 @@ Upgrading from 2.0.0 to 2.0.1

    to use either a / or base_url():

    -echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8">
    +echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8">
    echo form_open(base_url()); //<form action="http://example.com/" method="post" accept-charset="utf-8">     @@ -102,4 +102,4 @@ Next Topic:  Troubleshooting - \ No newline at end of file + diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 7361d7961..64ba482ce 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -82,12 +82,12 @@ For example, if you build a page in one of your controller functions, don't set

    Permits you to set the mime-type of your page so you can serve JSON data, JPEG's, XML, etc easily.

    -$this->output
    -    ->set_content_type('application/json')
    -    ->set_output(json_encode(array('foo' => 'bar')));
    -
    -$this->output
    -    ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php
    +$this->output
    +    ->set_content_type('application/json')
    +    ->set_output(json_encode(array('foo' => 'bar')));
    +
    +$this->output
    +    ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php
        ->set_output(file_get_contents('files/something.jpg'));

    Important: Make sure any non-mime string you pass to this method exists in config/mimes.php or it will have no effect.

    @@ -174,4 +174,4 @@ Next Topic:  Pagination Class - \ No newline at end of file + diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index e1d3640d3..d6641c883 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -133,7 +133,7 @@ You can find this list in application/config/user_agents.php if you w else if ($this->agent->is_mobile())
    {
        $this->load->view('mobile/home');
    -}
    +}
    else
    {
        $this->load->view('web/home');
    @@ -223,4 +223,4 @@ Next Topic:  XML-RPC Class - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From 869e3721d75e9798a706d24d93170f44e5ab6cb3 Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Sun, 11 Sep 2011 14:00:26 -0400 Subject: Changed the add_package_path documentation to show the second param for view path loading. --- user_guide/libraries/loader.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide') diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index af27176ad..98864a700 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -241,9 +241,9 @@ $this->load->library('foo_bar');

    In this instance, it is possible for view naming collisions within packages to occur, and possibly the incorrect package being loaded. To ensure against this, set an optional second parameter of FALSE when calling add_package_path().

    -$this->load->add_package_path(APPPATH.'my_app', TRUE);
    +$this->load->add_package_path(APPPATH.'my_app', FALSE);
    $this->load->view('my_app_index'); // Loads
    -$this->load->view('welcome_message'); // Will not load the default welcome_message b/c the second param to add_package_path is TRUE
    +$this->load->view('welcome_message'); // Will not load the default welcome_message b/c the second param to add_package_path is FALSE

    // Reset things
    $this->load->remove_package_path(APPPATH.'my_app');
    -- cgit v1.2.3-24-g4f1b From ec63402585f54f7f2399dc82b1fe402f726315ff Mon Sep 17 00:00:00 2001 From: Chris Schmitz Date: Tue, 13 Sep 2011 10:02:43 -0500 Subject: Minor typo and grammar corrections. --- user_guide/helpers/form_helper.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'user_guide') diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index 0afe0eb53..511eeab89 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -180,12 +180,12 @@ echo form_input('username', 'johndoe', $js);

    form_password()

    This function is identical in all respects to the form_input() function above -except that is sets it as a "password" type.

    +except that it uses the "password" input type.

    form_upload()

    This function is identical in all respects to the form_input() function above -except that is sets it as a "file" type, allowing it to be used to upload files.

    +except that it uses the "file" input type, allowing it to be used to upload files.

    form_textarea()

    @@ -318,7 +318,7 @@ fourth parameter:

    form_radio()

    -

    This function is identical in all respects to the form_checkbox() function above except that is sets it as a "radio" type.

    +

    This function is identical in all respects to the form_checkbox() function above except that it uses the "radio" input type.

    form_submit()

    -- cgit v1.2.3-24-g4f1b From 6c9b9b2abc56a692a381375835a41fc4fe56f246 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 13 Sep 2011 23:26:55 +0800 Subject: Update: add changelog for valid_email() function --- user_guide/changelog.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3b4c72b4c..ba138084e 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -79,7 +79,7 @@ Change Log
  • Helpers
    • Added increment_string() to String Helper to turn "foo" into "foo-1" or "foo-1" into "foo-2".
      • -
    • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
      • +
    • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
    • url_title() will now trim extra dashes from beginning and end.
    • Improved speed of String Helper's random_string() method
    @@ -102,6 +102,7 @@ Change Log
  • Added max_filename_increment config setting for Upload library.
  • CI_Loader::_ci_autoloader() is now a protected method.
  • Added is_unique to the Form Validation library.
    • +
  • Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the Form Validation library.
  • Core @@ -117,9 +118,9 @@ Change Log
  • If a config class was loaded first then a library with the same name is loaded, the config would be ignored.
  • Fixed a bug (Reactor #19) where 1) the 404_override route was being ignored in some cases, and 2) auto-loaded libraries were not available to the 404_override controller when a controller existed but the requested method did not.
  • Fixed a bug (Reactor #89) where MySQL export would fail if the table had hyphens or other non alphanumeric/underscore characters.
    • -
  • Fixed a bug (#200) where MySQL queries would be malformed after calling count_all() then db->get()
    • -
  • Fixed bug #105 that stopped query errors from being logged unless database debugging was enabled
    • -
  • Fixed a bug (#181) where a mis-spelling was in the form validation language file.
    • +
  • Fixed a bug (#200) where MySQL queries would be malformed after calling count_all() then db->get()
    • +
  • Fixed bug #105 that stopped query errors from being logged unless database debugging was enabled
    • +
  • Fixed a bug (#181) where a mis-spelling was in the form validation language file.
  • Fixed a bug (#160) - Removed unneeded array copy in the file cache driver.
  • Fixed a bug (#150) - field_data() now correctly returns column length.
  • Fixed a bug (#8) - load_class() now looks for core classes in APPPATH first, allowing them to be replaced.
    • -- cgit v1.2.3-24-g4f1b From 6f5b52bfd80319c3bba3ae57fb636df3890fe8f7 Mon Sep 17 00:00:00 2001 From: mmestrovic Date: Wed, 14 Sep 2011 01:26:15 +0300 Subject: Added link: "Upgrading from 2.0.3 to 2.1.0" --- user_guide/installation/upgrading.html | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide') diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html index 58a45ee9d..0f4a29bfd 100644 --- a/user_guide/installation/upgrading.html +++ b/user_guide/installation/upgrading.html @@ -60,6 +60,7 @@ Upgrading from a Previous Version

    Please read the upgrade notes corresponding to the version you are upgrading from.

      +
    • Upgrading from 2.0.3 to 2.1.0
    • Upgrading from 2.0.2 to 2.0.3
    • Upgrading from 2.0.1 to 2.0.2
    • Upgrading from 2.0 to 2.0.1
      • -- cgit v1.2.3-24-g4f1b From 9d9fe16060a3db6293df93eadfae965d790022c2 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 14 Sep 2011 11:03:32 -0400 Subject: Added connection information note in documentation --- user_guide/database/connecting.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide') diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index 309f2bc1a..b18088132 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -121,6 +121,8 @@ $this->load->database($config);

      For information on each of these values please see the configuration page.

      +

      Note: For the PDO driver, $config['hostname'] should look like this: 'mysql:host=localhost'

      +

      Or you can submit your database values as a Data Source Name. DSNs must have this prototype:

      $dsn = 'dbdriver://username:password@hostname/database';
      -- cgit v1.2.3-24-g4f1b From 51a4888c71287e66d21c9749c13ba895953b9acb Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 14 Sep 2011 13:47:06 -0400 Subject: Fixed affected_rows() function, added PDO/postgres note for insert_id() function --- user_guide/database/helpers.html | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide') diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 6a8aba55b..ecd0d84b6 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -64,6 +64,7 @@ Query Helpers

      $this->db->insert_id()

      The insert ID number when performing database inserts.

      +

      Note: If using the PDO driver with PostgreSQL, this function requires a $name parameter, which specifies the appropriate sequence to check for the insert id.

      $this->db->affected_rows()

      Displays the number of affected rows, when doing "write" type queries (insert, update, etc.).

      -- cgit v1.2.3-24-g4f1b From 57cea51f89a1da6f15d2e9e22dbd5f071b7bb286 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 14 Sep 2011 14:26:28 -0400 Subject: Miscellaneous fixes --- user_guide/database/helpers.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'user_guide') diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index ecd0d84b6..be6c339b4 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -68,8 +68,7 @@ Query Helpers

      $this->db->affected_rows()

      Displays the number of affected rows, when doing "write" type queries (insert, update, etc.).

      -

      Note: In MySQL "DELETE FROM TABLE" returns 0 affected rows. The database class has a small hack that allows it to return the -correct number of affected rows. By default this hack is enabled but it can be turned off in the database driver file.

      +

      Note: In MySQL "DELETE FROM TABLE" returns 0 affected rows. The database class has a small hack that allows it to return the correct number of affected rows. By default this hack is enabled but it can be turned off in the database driver file.

      $this->db->count_all();

      -- cgit v1.2.3-24-g4f1b From 45697901e4a44ecf1411a21a6014c8ff16e20c91 Mon Sep 17 00:00:00 2001 From: saintnicster Date: Wed, 14 Sep 2011 16:30:21 -0500 Subject: Copied into GitHub from @kenjis 's bitbucket repo.https://bitbucket.org/kenjis/ci-user-guide/changeset/3d579dd14afe --- user_guide/database/active_record.html | 37 +++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 10259a4af..70aecbdb5 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -543,7 +543,7 @@ $data = array(
         )
      );

      -$this->db->update_batch('mytable', $data); +$this->db->insert_batch('mytable', $data);

      // Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date'), ('Another title', 'Another name', 'Another date')       @@ -666,6 +666,41 @@ You can optionally pass this information directly into the update function as a

      You may also use the $this->db->set() function described above when performing updates.

      +

      $this->db->update_batch();

      +

      Generates an update string based on the data you supply, and runs the query. You can either pass an +array or an object to the function. Here is an example using an array:

      + + +$data = array(
      +   array(
      +      'title' => 'My title' ,
      +      'name' => 'My Name 2' ,
      +      'date' => 'My date 2'
      +   ),
      +   array(
      +      'title' => 'Another title' ,
      +      'name' => 'Another Name 2' ,
      +      'date' => 'Another date 2'
      +   )
      +);
      +
      +$this->db->update_batch('mytable', $data, 'title'); +

      +// Produces:
      +// UPDATE `mytable` SET `name` = CASE
      +// WHEN `title` = 'My title' THEN 'My Name 2'
      +// WHEN `title` = 'Another title' THEN 'Another Name 2'
      +// ELSE `name` END,
      +// `date` = CASE
      +// WHEN `title` = 'My title' THEN 'My date 2'
      +// WHEN `title` = 'Another title' THEN 'Another date 2'
      +// ELSE `date` END
      +// WHERE `title` IN ('My title','Another title')       + +

      The first parameter will contain the table name, the second is an associative array of values, the third parameter is the where key.

      + +

      Note: All values are escaped automatically producing safer queries.

      +  

      Deleting Data

      -- cgit v1.2.3-24-g4f1b From 255a5c162a90279de3fca53d889d8c0daf2be7c0 Mon Sep 17 00:00:00 2001 From: Jeroen van der Gulik Date: Fri, 16 Sep 2011 14:37:38 +0200 Subject: updated 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 ba138084e..8dd64a3a2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -114,6 +114,7 @@ Change Log

      Bug fixes for 2.1.0

        +
      • Unlink raised an error if cache file did not exist when you try to delete it.
      • Fixed #378 Robots identified as regular browsers by the User Agent class.
      • If a config class was loaded first then a library with the same name is loaded, the config would be ignored.
      • Fixed a bug (Reactor #19) where 1) the 404_override route was being ignored in some cases, and 2) auto-loaded libraries were not available to the 404_override controller when a controller existed but the requested method did not.
        • -- cgit v1.2.3-24-g4f1b From badaf2f3389502f02e086f7e34818ad52065213b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 17 Sep 2011 21:58:21 +0300 Subject: Update the 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 8dd64a3a2..b86204438 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,7 @@ Change Log
      • Added additional option 'none' for the optional third argument for $this->db->like() in the Database Driver.
        • +
      • Added support for the configured database character set in OCI8 driver.
    • Libraries -- cgit v1.2.3-24-g4f1b From 4f04b81bb03587cf8c81513b18fa08c27dba8352 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 17 Sep 2011 22:01:14 +0300 Subject: Updated ChangeLog. --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b86204438..8a4a70642 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,7 +91,6 @@ Change Log
    • Added additional option 'none' for the optional third argument for $this->db->like() in the Database Driver.
      • -
    • Added support for the configured database character set in OCI8 driver.
  • Libraries @@ -129,6 +128,7 @@ Change Log
  • Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().
  • Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.
  • Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session.
    • +
  • Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 44e6182d2e50aef657511660b96486a2c8f8d78d Mon Sep 17 00:00:00 2001 From: Aaron Kuzemchak Date: Tue, 20 Sep 2011 21:29:30 -0400 Subject: Updating 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 fb6e4493a..ad4f6c703 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -97,6 +97,7 @@ Change Log
  • Added max_filename_increment config setting for Upload library.
  • CI_Loader::_ci_autoloader() is now a protected method.
  • Added is_unique to the Form Validation library.
    • +
  • Added $config['use_page_numbers'] to the Pagination library, which enables real page numbers in the URI.
  • Core -- cgit v1.2.3-24-g4f1b From ef3e2402b22a7687730520971c27bec466b5167d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 21 Sep 2011 14:39:29 +0300 Subject: Fix issue #182 in system/database/drivers/oci8_result.php by caching the num_rows property after statement execution --- 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 8a4a70642..b205d5e3b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -129,6 +129,7 @@ Change Log
  • Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.
  • Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session.
  • Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.
    • +
  • Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 19277f05c20a3de4beaebcac722659a0ed30a374 Mon Sep 17 00:00:00 2001 From: Adrian Macneil Date: Thu, 22 Sep 2011 11:17:58 -0700 Subject: Documented third $after_field parameter of dbforge->add_column() --- user_guide/database/forge.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide') diff --git a/user_guide/database/forge.html b/user_guide/database/forge.html index 6b8709892..528d1a24c 100644 --- a/user_guide/database/forge.html +++ b/user_guide/database/forge.html @@ -201,6 +201,10 @@ already be running, since the forge class relies on it.

    $this->dbforge->add_column('table_name', $fields);

    // gives ALTER TABLE table_name ADD preferences TEXT

    +

    An optional third parameter can be used to specify which existing column to add the new column after.

    +

    +$this->dbforge->add_column('table_name', $fields, 'after_field'); +

    $this->dbforge->drop_column()

    Used to remove a column from a table.

    $this->dbforge->drop_column('table_name', 'column_to_drop');

    -- cgit v1.2.3-24-g4f1b From 99c6dd49e61c463499d1e50945ac29a3f383ec48 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 23 Sep 2011 03:07:01 +0300 Subject: Add ->db->insert_batch() support to the OCI8 (Oracle) driver --- 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 8a4a70642..950a0d482 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -91,6 +91,7 @@ Change Log
  • Added additional option 'none' for the optional third argument for $this->db->like() in the Database Driver.
    • +
  • Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
  • Libraries -- cgit v1.2.3-24-g4f1b From dc46d99fe8ab2058df15c6a7608e5ae41ffffb2b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 24 Sep 2011 16:25:23 +0300 Subject: Escape WHERE clause field names in the DB update_string() method --- 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 7ff2af2f5..50875abf1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -132,6 +132,7 @@ Change Log
  • Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session.
  • Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.
  • Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.
    • +
  • Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 89e1780f16ea91e913d4231ec07b90391622c8cb Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 24 Sep 2011 17:09:44 +0300 Subject: Fix a variable type mismatch (issue #89) in system/database/DB_driver.php --- 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 50875abf1..0afdbe4a1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -133,6 +133,7 @@ Change Log
  • Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.
  • Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.
  • Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.
    • +
  • Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead.

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 4f27b5b93090e483d73a8be0dbb4587309ed3686 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 24 Sep 2011 18:49:44 +0300 Subject: Update the 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 0afdbe4a1..6b4e83c2f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -134,6 +134,7 @@ Change Log
  • Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.
  • Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.
  • Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead.
    • +
  • Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4)

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From d93e6f3890fd50b9aaf1e116fa8ceb7e3f0caa05 Mon Sep 17 00:00:00 2001 From: Chris Berthe Date: Sun, 25 Sep 2011 10:33:25 -0400 Subject: Fix #484 - Hash is never set to the cookie --- 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 6b4e83c2f..fc1eb46b3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -135,6 +135,7 @@ Change Log
  • Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.
  • Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead.
  • Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4)
    • +
  • Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).

    • Version 2.0.3

    -- cgit v1.2.3-24-g4f1b From 3ac44314ab818f2f3c658e5e0aa5cce6018c1a3a Mon Sep 17 00:00:00 2001 From: cenk Date: Mon, 26 Sep 2011 15:03:41 +0300 Subject: Edited user_guide/helpers/html_helper.html via GitHub --- user_guide/helpers/html_helper.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide') diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html index 92bfdfb2e..4b1342724 100644 --- a/user_guide/helpers/html_helper.html +++ b/user_guide/helpers/html_helper.html @@ -348,6 +348,11 @@ echo doctype('html4-trans');
    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> + XHTML Basic 1.1 + doctype('xhtml-basic11') + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"> + + HTML 5 doctype('html5') <!DOCTYPE html> -- cgit v1.2.3-24-g4f1b From 60c2965192a763c05d571afa9047e6e8166c9ddd Mon Sep 17 00:00:00 2001 From: cenk Date: Mon, 26 Sep 2011 15:16:56 +0300 Subject: Added XHTML Basic 1.1 (xhtml-basic11) doctype. --- 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 fc1eb46b3..5d660a4bc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,6 +82,7 @@ Change Log
  • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
  • url_title() will now trim extra dashes from beginning and end.
  • Improved speed of String Helper's random_string() method
    • +
  • Added XHTML Basic 1.1 doctype to HTML Helper
  • Database -- cgit v1.2.3-24-g4f1b From 23c5256e1aceccb11f74634b4fbaa6619898efbf Mon Sep 17 00:00:00 2001 From: cenk Date: Mon, 26 Sep 2011 15:17:59 +0300 Subject: Added XHTML Basic 1.1 (xhtml-basic11) doctype. --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5d660a4bc..9b35e55fb 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,7 +82,7 @@ Change Log
  • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
  • url_title() will now trim extra dashes from beginning and end.
  • Improved speed of String Helper's random_string() method
    • -
  • Added XHTML Basic 1.1 doctype to HTML Helper
  • +
  • Added XHTML Basic 1.1 doctype to HTML Helper.
  • Database -- cgit v1.2.3-24-g4f1b From 32851c4a171eeb3c1821a24d5a1bb8843e1ca084 Mon Sep 17 00:00:00 2001 From: cenk Date: Mon, 26 Sep 2011 15:49:50 +0300 Subject: Close
  • tag. --- user_guide/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9b35e55fb..81514af73 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -82,7 +82,7 @@ Change Log
  • Altered form helper - made action on form_open_multipart helper function call optional. Fixes (#65)
  • url_title() will now trim extra dashes from beginning and end.
  • Improved speed of String Helper's random_string() method
    • -
  • Added XHTML Basic 1.1 doctype to HTML Helper.
  • +
  • Added XHTML Basic 1.1 doctype to HTML Helper.
  • Database -- cgit v1.2.3-24-g4f1b From 9a30299fd128c536190b9dd310fc7f4eee21ed07 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 27 Sep 2011 16:03:06 +0800 Subject: Update: user guide Previous Topic and Next Topic url errors. --- user_guide/general/cli.html | 4 ++-- user_guide/general/managing_apps.html | 6 +++--- user_guide/general/profiling.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'user_guide') diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html index 4e9bf8709..9091e9362 100644 --- a/user_guide/general/cli.html +++ b/user_guide/general/cli.html @@ -138,11 +138,11 @@ class Tools extends CI_Controller { diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html index e716d1072..93585e212 100644 --- a/user_guide/general/managing_apps.html +++ b/user_guide/general/managing_apps.html @@ -120,14 +120,14 @@ calls the desired application. The index.php file can be named anything you wan - \ No newline at end of file + diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 0993da5b4..c7c4ed38c 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -177,10 +177,10 @@ Previous Topic:  Caching    ·   Top of Page   ·   User Guide Home   ·   -Next Topic:  Managing Applications +Next Topic:  Running via the CLI

    CodeIgniter  ·  Copyright © 2006 - 2011  ·  EllisLab, Inc.

    - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From ad67aae58583bf08f2ca306d100052d6d5ed629e Mon Sep 17 00:00:00 2001 From: Radu Potop Date: Wed, 28 Sep 2011 14:25:03 +0300 Subject: Updated documentation for TLS and SSL support in Email library. --- user_guide/changelog.html | 1 + user_guide/libraries/email.html | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'user_guide') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index fc1eb46b3..34fefb0bd 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -105,6 +105,7 @@ Change Log
  • Added is_unique to the Form Validation library.
  • Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the Form Validation library.
  • Added $config['use_page_numbers'] to the Pagination library, which enables real page numbers in the URI.
    • +
  • Added TLS and SSL Encryption for SMTP.
  • Core diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index d246254ab..de2f1c0c9 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -63,6 +63,7 @@ Email Class
    • Multiple Protocols: Mail, Sendmail, and SMTP
      • +
    • TLS and SSL Encryption for SMTP
    • Multiple recipients
    • CC and BCCs
    • HTML or Plaintext email
      • @@ -152,6 +153,8 @@ will NOT need to use the $this->email->initialize() function if you s smtp_timeout5NoneSMTP Timeout (in seconds). +smtp_cryptoNo Defaulttls or sslSMTP Encryption. + wordwrapTRUETRUE or FALSE (boolean)Enable word-wrap. wrapchars76 Character count to wrap at. @@ -304,4 +307,4 @@ Next Topic:  Encryption Class - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b From 1244d84855325ad94e2563f23574259840cb85b0 Mon Sep 17 00:00:00 2001 From: freewil Date: Thu, 29 Sep 2011 22:11:01 -0400 Subject: add changelog note about CI_CORE removal --- 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 81514af73..1a6cf9868 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -111,6 +111,7 @@ Change Log
    • Core
      • Changed private functions in CI_URI to protected so MY_URI can override them.
        • +
      • Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
    -- cgit v1.2.3-24-g4f1b