diff options
| -rw-r--r-- | system/codeigniter/Base4.php | 6 | ||||
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | system/libraries/Controller.php | 3 | ||||
| -rw-r--r-- | system/libraries/Table.php | 8 | ||||
| -rw-r--r-- | user_guide/database/utilities.html | 4 | ||||
| -rw-r--r-- | user_guide/general/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/general/controllers.html | 1 | ||||
| -rw-r--r-- | user_guide/installation/upgrade_150.html | 8 | ||||
| -rw-r--r-- | user_guide/libraries/file_uploading.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/image_lib.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/table.html | 4 | ||||
| -rw-r--r-- | user_guide/libraries/trackback.html | 2 | ||||
| -rw-r--r-- | user_guide/nav/nav.js | 2 | ||||
| -rw-r--r-- | user_guide/toc.html | 2 |
14 files changed, 30 insertions, 18 deletions
diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php index 9366b4588..2793317e7 100644 --- a/system/codeigniter/Base4.php +++ b/system/codeigniter/Base4.php @@ -21,7 +21,7 @@ * This file is used only when Code Igniter is being run under PHP 4. * * In order to allow CI to work under PHP 4 we had to make the Loader class - * the parent of the Controller Base class. It's the only way we enabled + * the parent of the Controller Base class. It's the only way we can * enable functions like $this->load->library('email') to instantiate * classes that can then be used within controllers as $this->email->send() * @@ -42,11 +42,13 @@ function CI_Base() { + // This allows syntax like $this->load->foo() to work parent::CI_Loader(); $this->load =& $this; + // This allows resources used within controller constructors to work global $OBJ; - $OBJ = $this->load; + $OBJ = $this->load; // Do NOT use a reference. } } diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 6da645a38..22f91ed4c 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -400,7 +400,7 @@ class CI_DB_driver { $this->initialize(); } - return $this->_execute($sql, $this->conn_id); + return $this->_execute($sql); } // -------------------------------------------------------------------- diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 938c46e4c..88ab46164 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -75,8 +75,7 @@ class Controller extends CI_Base { { $this->$var =& load_class($class); } - - + // In PHP 5 the Controller class is run as a discreet // class. In PHP 4 it extends the Controller if (floor(phpversion()) >= 5) diff --git a/system/libraries/Table.php b/system/libraries/Table.php index 0f2c49d96..61d04eef5 100644 --- a/system/libraries/Table.php +++ b/system/libraries/Table.php @@ -211,9 +211,13 @@ class CI_Table { } // Next blast through the result array and build out the rows - foreach ($query->result_array() as $row) + + if ($query->num_rows() > 0) { - $this->rows[] = $row; + foreach ($query->result_array() as $row) + { + $this->rows[] = $row; + } } } diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index 1fdc4b009..de025ea3a 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -311,9 +311,9 @@ $this->dbutil->backup($prefs); </tr><tr>
<td class="td"><strong>add_drop</strong></td><td class="td">TRUE</td><td class="td">TRUE/FALSE</td><td class="td">Whether to include DROP TABLE statements in your SQL export file.</td>
</tr><tr>
-<td class="td"><strong>add_insert/strong></td><td class="td">TRUE</td><td class="td">TRUE/FALSE</td><td class="td">Whether to include INSERT statements in your SQL export file.</td>
+<td class="td"><strong>add_insert</strong></td><td class="td">TRUE</td><td class="td">TRUE/FALSE</td><td class="td">Whether to include INSERT statements in your SQL export file.</td>
</tr><tr>
-<td class="td"><strong>newline/strong></td><td class="td">"\n"</td><td class="td">"\n", "\r", "\r\n"</td><td class="td">Type of newline to use in your SQL export file.</td>
+<td class="td"><strong>newline</strong></td><td class="td">"\n"</td><td class="td">"\n", "\r", "\r\n"</td><td class="td">Type of newline to use in your SQL export file.</td>
</tr>
</table>
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 81dbcff99..6fac208f2 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -80,7 +80,7 @@ Change Log <li>Added <a href="../database/queries.html">simple_query()</a> function to the database classes</li>
<li>Added <a href="../helpers/date_helper.html">standard_date()</a> function to the Date Helper.</li>
<li>Added <a href="../database/results.html">$query->free_result()</a> to database class.</li>
-<li>Added <a href="../database/fields.html">$query->field_names()</a> function to database class</li>
+<li>Added <a href="../database/fields.html">$query->list_fields()</a> function to database class</li>
<li>Added <a href="../database/helpers.html">$this->db->platform()</a> function</li>
<li>Added "is_numeric" to validation, which uses the native PHP is_numeric function.</li>
<li>Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.</li>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html index 49f8e58a8..db488c54c 100644 --- a/user_guide/general/controllers.html +++ b/user_guide/general/controllers.html @@ -398,6 +398,7 @@ is a list of reserved names. Do not name your controller functions any of these <li>_ci_autoloader</li>
<li>_ci_init_class</li>
<li>_ci_init_scaffolding</li>
+<li>_ci_is_instance</li>
<li>_ci_load</li>
<li>_ci_load_class</li>
<li>_ci_object_to_array</li>
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index b532073fd..e757d35a4 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -97,8 +97,14 @@ $db['default']['cachedir'] = ''; </pre>
+<h2>Step 3: Update your main index.php file</h2>
-<h2>Step 3: Update your user guide</h2>
+<p>If you are running a stock <dfn>index.php</dfn> file simply replace your version with the new one. If you are running one with
+internal modifications, open it and add this line of code near the bottom:</p>
+
+<code>define('FCPATH', __FILE__);</code>
+
+<h2>Step 4: Update your user guide</h2>
<p>Please also replace your local copy of the user guide with the new version.</p>
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 9e7795796..600a7fb3b 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -426,7 +426,7 @@ Previous Topic: <a href="encryption.html">Encryption Class</a> ·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="image_lib.html">Image Manipulation Class</a>
+Next Topic: <a href="table.html">HTML Table Class</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index c33ec20ec..4538e8636 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -656,7 +656,7 @@ will be positioned at the bottom/center of the image, 20 pixels from the bottom <div id="footer">
<p>
-Previous Topic: <a href="file_uploading.html">File Uploading Class</a>
+Previous Topic: <a href="table.html">HTML Table Class</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index 61b5ce82f..77f57087c 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -216,11 +216,11 @@ $this->table->set_template($tmpl); <div id="footer">
<p>
-Previous Topic: <a href="sessions.html">Session Class</a>
+Previous Topic: <a href="file_uploading.html">File Uploading Class</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="trackback.html">Trackback Class</a>
+Next Topic: <a href="image_lib.html">Image Manipulation Class</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 0621d4e75..c4caf5e4a 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -238,7 +238,7 @@ It returns TRUE on success and FALSE on failure. If it fails you will issue an <div id="footer">
<p>
-Previous Topic: <a href="table.html">HTML Table Class</a>
+Previous Topic: <a href="sessions.html">Session Class</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index b280e8fc7..150c7caf0 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -71,6 +71,7 @@ function create_menu(basepath) '<li><a href="'+base+'libraries/email.html">Email Class</a></li>' + '<li><a href="'+base+'libraries/encryption.html">Encryption Class</a></li>' + '<li><a href="'+base+'libraries/file_uploading.html">File Uploading Class</a></li>' + + '<li><a href="'+base+'libraries/table.html">HTML Table Class</a></li>' + '<li><a href="'+base+'libraries/image_lib.html">Image Manipulation Class</a></li>' + '<li><a href="'+base+'libraries/input.html">Input and Security Class</a></li>' + '<li><a href="'+base+'libraries/loader.html">Loader Class</a></li>' + @@ -78,7 +79,6 @@ function create_menu(basepath) '<li><a href="'+base+'libraries/output.html">Output Class</a></li>' + '<li><a href="'+base+'libraries/pagination.html">Pagination Class</a></li>' + '<li><a href="'+base+'libraries/sessions.html">Session Class</a></li>' + - '<li><a href="'+base+'libraries/table.html">Table Class</a></li>' + '<li><a href="'+base+'libraries/trackback.html">Trackback Class</a></li>' + '<li><a href="'+base+'libraries/parser.html">Template Parser Class</a></li>' + '<li><a href="'+base+'libraries/unit_testing.html">Unit Testing Class</a></li>' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 65bf2e163..7eaa5ae46 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -125,6 +125,7 @@ Table of Contents <li><a href="./libraries/email.html">Email Class</a></li>
<li><a href="./libraries/encryption.html">Encryption Class</a></li>
<li><a href="./libraries/file_uploading.html">File Uploading Class</a></li>
+<li><a href="./libraries/table.html">HTML Table Class</a></li>
<li><a href="./libraries/image_lib.html">Image Manipulation Class</a></li>
<li><a href="./libraries/input.html">Input and Security Class</a></li>
<li><a href="./libraries/loader.html">Loader Class</a></li>
@@ -132,7 +133,6 @@ Table of Contents <li><a href="./libraries/output.html">Output Class</a></li>
<li><a href="./libraries/pagination.html">Pagination Class</a></li>
<li><a href="./libraries/sessions.html">Session Class</a></li>
-<li><a href="./libraries/table.html">Table Class</a></li>
<li><a href="./libraries/trackback.html">Trackback Class</a></li>
<li><a href="./libraries/parser.html">Template Parser Class</a></li>
<li><a href="./libraries/unit_testing.html">Unit Testing Class</a></li>
|