11 files changed, 21 insertions, 11 deletions

diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 32c0b2cdc..4c7eaa54e 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -42,6 +42,11 @@ function read_file($file)
 	{
 		return FALSE;
 	}
+	
+	if (function_exists('file_get_contents'))
+	{
+		return file_get_contents($file);		
+	}
 
 	if ( ! $fp = @fopen($file, 'rb'))
 	{
@@ -53,7 +58,7 @@ function read_file($file)
 	$data = '';
 	if (filesize($file) > 0) 
 	{
-		$data = fread($fp, filesize($file)); 
+		$data =& fread($fp, filesize($file)); 
 	}
 
 	flock($fp, LOCK_UN);
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index 954570c70..8575b2534 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -85,7 +85,7 @@ It DOES NOT return a database result set, nor does it set the query timer, or co
 It simply lets you submit a query. Most users will rarely use this function.</p>

 

 

-<h1><br />Escaping Queries</h1>

+<h1>Escaping Queries</h1>

 

 <p>It's a very good security practice to escape your data before sumbiting it into your database. 

 Code Igniter has two functions that help you do this:</p>

@@ -107,7 +107,7 @@ Most of the time you'll use the above function rather then this one. Use the fun
 </ol>

 

 

-<h1><br />Query Bindings</h1>

+<h1>Query Bindings</h1>

 

 

 <p>Bindings enable you to simplify your query syntax by letting the system put the queries together for you. Consider the following example:</p>

diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index 75f4357b4..607c9857c 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -181,8 +181,8 @@ Query Results
 </p>

 

 

-

-<h1><br />Result Helper Functions</h1>

+<br />

+<h1>Result Helper Functions</h1>

 

 

 <h2>$query->num_rows()</h2>

diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 0671b8baa..19366499d 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -74,7 +74,8 @@ Change Log
 <li>Added <a href="../libraries/Zip.html">Zip Encoding Library</a> permitting files to be Zip compressed.</li>

 <li>Added the ability to <a href="creating_libraries.html">extend libraries</a> and <a href="core_classes.html">extend core classes</a>, in addition to being able to replace them.</li>

 <li>Added support for storing <a href="models.html">models within sub-folders</a>.</li>

-<li>Added simple_query() function to the database classes</li>

+<li>Added <a href="../helpers/download_helper.html">Download Helper</a>.</li>

+<li>Added <a href="../database/queries.html">simple_query()</a> function to the database classes</li>

 <li>Added $query->free_result();</li>

 <li>Added $query->field_names() function</li>

 <li>Added $this->db->platform() function</li>

diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index 2eeee6d7e..c1062bddd 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -98,7 +98,7 @@ routine is effectively the same as register_globals = off.</p>
 <p>The magic_quotes_runtime directive is turned off during system initialization so that you don't have to remove slashes when

 retrieving data from your database.</p>

 

-<h1><br />Best Practices</h1>

+<h1>Best Practices</h1>

 

 <p>Before accepting any data into your application, whether it be POST data from a form submission, COOKIE data, URI data, 

 XML-RPC data, or even data from the SERVER array, you are encouraged to practice this three step approach:</p>

diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
index c17e0dfd0..92e2461d0 100644
--- a/user_guide/helpers/directory_helper.html
+++ b/user_guide/helpers/directory_helper.html
@@ -136,7 +136,7 @@ Previous Topic:&nbsp;&nbsp;<a href="date_helper.html">Date Helper</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;

-Next Topic:&nbsp;&nbsp;<a href="file_helper.html">File Helper</a>

+Next Topic:&nbsp;&nbsp;<a href="download_helper.html">Download Helper</a>

 <p>

 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>

 </div>

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index 1eb60b1ed..32c538859 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -63,7 +63,8 @@ Downloading Code Igniter
 <h1>Downloading Code Igniter</h1>

 

 <ul>

-<li><a href="http://www.codeigniter.com/download.php">Code Igniter V 1.4.0 (Current version)</a></li>

+<li><a href="http://www.codeigniter.com/download.php">Code Igniter V 1.5.0 (Current version)</a></li>

+<li><a href="http://www.codeigniter.com/CodeIgniter_1.4.0.zip">Code Igniter V 1.4.0</a></li>

 <li><a href="http://www.codeigniter.com/downloads/CodeIgniter_1.3.3.zip">Code Igniter V 1.3.3</a></li>

 <li><a href="http://www.codeigniter.com/downloads/CodeIgniter_1.3.2.zip">Code Igniter V 1.3.2</a></li>

 <li><a href="http://www.codeigniter.com/downloads/CodeIgniter_1.3.1.zip">Code Igniter V 1.3.1</a></li>

diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index f126bd0b7..da3715e84 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -89,7 +89,7 @@ $this->zip->archive('/path/to/directory/my_backup.zip');
 $this->zip->download('my_backup.zip');

 </code>

 

-<h1><br />Function Reference</h1>

+<h1>Function Reference</h1>

 

 <h2>$this->zip->add_data()</h2>

 

diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js
index fa8a673f4..fc2d609a1 100644
--- a/user_guide/nav/nav.js
+++ b/user_guide/nav/nav.js
@@ -94,6 +94,7 @@ function create_menu(basepath)
 		'<li><a href="'+base+'helpers/cookie_helper.html">Cookie Helper</a></li>' +
 		'<li><a href="'+base+'helpers/date_helper.html">Date Helper</a></li>' +
 		'<li><a href="'+base+'helpers/directory_helper.html">Directory Helper</a></li>' +
+		'<li><a href="'+base+'helpers/download_helper.html">Download Helper</a></li>' +
 		'<li><a href="'+base+'helpers/file_helper.html">File Helper</a></li>' +
 		'<li><a href="'+base+'helpers/form_helper.html">Form Helper</a></li>' +
 		'<li><a href="'+base+'helpers/html_helper.html">HTML Helper</a></li>' +
diff --git a/user_guide/toc.html b/user_guide/toc.html
index bdc2eedef..f4675b9b5 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -147,6 +147,7 @@ Table of Contents
 <li><a href="./helpers/cookie_helper.html">Cookie Helper</a></li> 

 <li><a href="./helpers/date_helper.html">Date Helper</a></li> 

 <li><a href="./helpers/directory_helper.html">Directory Helper</a></li> 

+<li><a href="./helpers/download_helper.html">Download Helper</a></li> 

 <li><a href="./helpers/file_helper.html">File Helper</a></li> 

 <li><a href="./helpers/form_helper.html">Form Helper</a></li> 

 <li><a href="./helpers/html_helper.html">HTML Helper</a></li> 

diff --git a/user_guide/userguide.css b/user_guide/userguide.css
index 4da90dc65..5cd6734f9 100644
--- a/user_guide/userguide.css
+++ b/user_guide/userguide.css
@@ -151,10 +151,11 @@ padding: 0 0 6px 0;
 

 #content h1 {

 color: #333;

+background-color: #efefef;

 font-weight: normal;

 font-size: 22px;

 margin: 0 0 15px 0;

-padding: 0;

+padding: 3px 2px 3px 10px;

 }

 

 #content h2 {