diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index 9366b45..2793317 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 6da645a..22f91ed 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -400,7 +400,7 @@
$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 938c46e..88ab461 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -75,8 +75,7 @@
{
$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 0f2c49d..61d04ee 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -211,9 +211,13 @@
}
// 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 1fdc4b0..de025ea 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -311,9 +311,9 @@
</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 81dbcff..6fac208 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -80,7 +80,7 @@
<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 49f8e58..db488c5 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -398,6 +398,7 @@
<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 b532073..e757d35 100644
--- a/user_guide/installation/upgrade_150.html
+++ b/user_guide/installation/upgrade_150.html
@@ -97,8 +97,14 @@
</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 9e77957..600a7fb 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -426,7 +426,7 @@
·
<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 c33ec20..4538e86 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -656,7 +656,7 @@
<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 61b5ce8..77f5708 100644
--- a/user_guide/libraries/table.html
+++ b/user_guide/libraries/table.html
@@ -216,11 +216,11 @@
<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 0621d4e..c4caf5e 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -238,7 +238,7 @@
<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 b280e8f..150c7ca 100644
--- a/user_guide/nav/nav.js
+++ b/user_guide/nav/nav.js
@@ -71,6 +71,7 @@
'<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 @@
'<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 65bf2e1..7eaa5ae 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -125,6 +125,7 @@
<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 @@
<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>