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 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 -- 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 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