diff options
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/cilexer/cilexer/cilexer.py | 2 | ||||
| -rw-r--r-- | user_guide_src/source/_themes/eldocs/static/asset/css/common.css | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 9 | ||||
| -rw-r--r-- | user_guide_src/source/conf.py | 4 | ||||
| -rw-r--r-- | user_guide_src/source/database/utilities.rst | 53 | ||||
| -rw-r--r-- | user_guide_src/source/tutorial/static_pages.rst | 6 |
6 files changed, 39 insertions, 37 deletions
diff --git a/user_guide_src/cilexer/cilexer/cilexer.py b/user_guide_src/cilexer/cilexer/cilexer.py index 1c41f2aa0..1edc7e820 100644 --- a/user_guide_src/cilexer/cilexer/cilexer.py +++ b/user_guide_src/cilexer/cilexer/cilexer.py @@ -15,7 +15,7 @@ # through the world wide web, please send an email to # licensing@ellislab.com so we can send you a copy immediately. # -# Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) +# Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) # http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) diff --git a/user_guide_src/source/_themes/eldocs/static/asset/css/common.css b/user_guide_src/source/_themes/eldocs/static/asset/css/common.css index 0a63871c5..648e33032 100644 --- a/user_guide_src/source/_themes/eldocs/static/asset/css/common.css +++ b/user_guide_src/source/_themes/eldocs/static/asset/css/common.css @@ -16,7 +16,7 @@ If you did not receive a copy of the license and are unable to obtain it through the world wide web, please send an email to licensing@ellislab.com so we can send you a copy immediately. -Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) +Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 61c79417c..5534a1ee7 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -180,10 +180,11 @@ Release Date: Not Released - Deprecated ``add_column()``'s third method. *AFTER* clause should now be added to the field definition array instead. - Added support for usage of the *FIRST* clause in ``add_column()`` for MySQL and CUBRID. - Overall improved support for all of the drivers. - - :doc:`Database Utility <database/utilities>` chages include: + - :doc:`Database Utility <database/utilities>` changes include: - Added support for passing a custom database object to the loader. - Modified the class to no longer extend :doc:`Database Forge <database/forge>`, which has been a deprecated behavior for awhile. - Overall improved support for all of the drivers. + - Added *foreign_key_checks* option to MySQL/MySQLi backup, allowing statement to disable/re-enable foreign key checks to be inserted into the backup output. - Libraries @@ -327,9 +328,9 @@ Bug fixes for 3.0 - Fixed a bug (#181) where a mis-spelling was in the form validation language file. - Fixed a bug (#159, #163) that mishandled Query Builder nested transactions because _trans_depth was not getting incremented. - Fixed a bug (#737, #75) - :doc:`Pagination <libraries/pagination>` anchor class was not set properly when using initialize method. -- Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary. -- Fixed a bug (#724) - is_unique in form validation now checks that you are connected to a database. -- Fixed a bug (#647) - _get_mod_time() in Zip library no longer generates stat failed errors. +- Fixed a bug (#419) - ``auto_link()`` now recognizes URLs that come after a word boundary. +- Fixed a bug (#724) - :doc:`Form Validation Library <libraries/form_validation>` rule **is_unique** didn't check if a database connection exists. +- Fixed a bug (#647) - :doc:`Zip Library <libraries/zip>` internal method ``_get_mod_time()`` didn't suppress possible "stat failed" errors generated by ``filemtime()``. - Fixed a bug (#608) - Fixes an issue with the Image_lib class not clearing properties completely. - Fixed a bug (#157, #174) - the Image_lib clear() function now resets all variables to their default values. - Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table. diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index f68405b36..6d77db060 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'CodeIgniter' -copyright = u'2012, EllisLab, Inc.' +copyright = u'2013, EllisLab, Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -224,7 +224,7 @@ man_pages = [ epub_title = u'CodeIgniter' epub_author = u'EllisLab, Inc.' epub_publisher = u'EllisLab, Inc.' -epub_copyright = u'2012, EllisLab, Inc.' +epub_copyright = u'2013, EllisLab, Inc.' # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index 06ecb2da1..bd40cdadd 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -45,7 +45,7 @@ $this->dbutil->list_databases(); Returns an array of database names:: $dbs = $this->dbutil->list_databases(); - + foreach ($dbs as $db) { echo $db; @@ -102,7 +102,7 @@ FALSE on failure. :: $result = $this->dbutil->optimize_database(); - + if ($result !== FALSE) { print_r($result); @@ -119,9 +119,9 @@ parameter of the method must contain the result object from your query. Example:: $this->load->dbutil(); - + $query = $this->db->query("SELECT * FROM mytable"); - + echo $this->dbutil->csv_from_result($query); The second, third, and fourth parameters allow you to set the delimiter @@ -147,16 +147,16 @@ parameter expects a query result object, the second may contain an optional array of config parameters. Example:: $this->load->dbutil(); - + $query = $this->db->query("SELECT * FROM mytable"); - + $config = array ( 'root' => 'root', 'element' => 'element', 'newline' => "\n", - 'tab' => "\t" + 'tab' => "\t" ); - + echo $this->dbutil->xml_from_result($query, $config); .. important:: This method will NOT write the XML file for you. It @@ -172,7 +172,7 @@ backup data can be compressed in either Zip or Gzip format. .. note:: This feature is only available for MySQL and Interbase/Firebird databases. .. note:: For Interbase/Firebird databases, the backup file name is the only parameter. - + Eg. $this->dbutil->backup('db_backup_filename'); .. note:: Due to the limited execution time and memory available to PHP, @@ -188,14 +188,14 @@ Usage Example // Load the DB utility class $this->load->dbutil(); - + // Backup your entire database and assign it to a variable $backup =& $this->dbutil->backup(); - + // Load the file helper and write the file to your server $this->load->helper('file'); write_file('/path/to/mybackup.gz', $backup); - + // Load the download helper and send the file to your desktop $this->load->helper('download'); force_download('mybackup.gz', $backup); @@ -215,22 +215,23 @@ parameter of the ``backup()`` method. Example:: 'add_insert' => TRUE, // Whether to add INSERT data to backup file 'newline' => "\n" // Newline character used in backup file ); - + $this->dbutil->backup($prefs); Description of Backup Preferences --------------------------------- -=============== ======================= ======================= ======================================================================== -Preference Default Value Options Description -=============== ======================= ======================= ======================================================================== -**tables** empty array None An array of tables you want backed up. If left blank all tables will be - exported. -**ignore** empty array None An array of tables you want the backup routine to ignore. -**format** gzip gzip, zip, txt The file format of the export file. -**filename** the current date/time None The name of the backed-up file. The name is needed only if you are using - zip compression. -**add_drop** TRUE TRUE/FALSE Whether to include DROP TABLE statements in your SQL export file. -**add_insert** TRUE TRUE/FALSE Whether to include INSERT statements in your SQL export file. -**newline** "\\n" "\\n", "\\r", "\\r\\n" Type of newline to use in your SQL export file. -=============== ======================= ======================= ========================================================================
\ No newline at end of file +======================= ======================= ======================= ======================================================================== +Preference Default Value Options Description +======================= ======================= ======================= ======================================================================== +**tables** empty array None An array of tables you want backed up. If left blank all tables will be + exported. +**ignore** empty array None An array of tables you want the backup routine to ignore. +**format** gzip gzip, zip, txt The file format of the export file. +**filename** the current date/time None The name of the backed-up file. The name is needed only if you are using + zip compression. +**add_drop** TRUE TRUE/FALSE Whether to include DROP TABLE statements in your SQL export file. +**add_insert** TRUE TRUE/FALSE Whether to include INSERT statements in your SQL export file. +**newline** "\\n" "\\n", "\\r", "\\r\\n" Type of newline to use in your SQL export file. +**foreign_key_checks** TRUE TRUE/FALSE Whether output should keep foreign key checks enabled. +======================= ======================= ======================= ========================================================================
\ No newline at end of file diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 708eaeb7b..97c74601d 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -58,11 +58,11 @@ following code. <html> <head> - <title>CodeIgniter 2 Tutorial</title> + <title>CodeIgniter Tutorial</title> </head> <body> - <h1>CodeIgniter 2 Tutorial</h1> + <h1>CodeIgniter Tutorial</h1> The header contains the basic HTML code that you'll want to display before loading the main view, together with a heading. It will also @@ -72,7 +72,7 @@ includes the following code: :: - <em>© 2012</em> + <em>© 2013</em> </body> <html> |