From 40d299e8221ba5d641e07c18ef19f4ac13ff9b85 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Sat, 4 Nov 2006 05:07:59 +0000
Subject:

---
 system/codeigniter/CodeIgniter.php  |  2 +-
 system/helpers/html_helper.php      | 21 +++++++++++++++++++++
 system/helpers/url_helper.php       |  4 ++--
 system/scaffolding/views/header.php |  2 --
 user_guide/changelog.html           |  8 ++++++++
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 367d5eaac..88659a744 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -132,7 +132,7 @@ load_class('Controller', FALSE);
 // Load the local application controller
 // Note: The Router class automatically validates the controller path.  If this include fails it 
 // means that the default controller in the Routes.php file is not resolving to something valid.
-if ( ! @include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT))
+if ( ! include(APPPATH.'controllers/'.$RTR->fetch_directory().$RTR->fetch_class().EXT))
 {
 	show_error('Unable to load your default controller.  Please make sure the controller specified in your Routes.php file is valid.');
 }
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index e32abfbf2..90a776386 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -178,6 +178,27 @@ function nbs($num = 1)
 	return str_repeat("&nbsp;", $num);
 }
 
+// ------------------------------------------------------------------------
+
+/**
+ * Generates meta tags from an array of key/values
+ *
+ * @access	public
+ * @param	array
+ * @return	string
+ */	
+function meta($meta = array(), $newline = "\n")
+{
+	$str = '';
+	foreach ($meta as $key => $val)
+	{
+		$str .= '<meta http-equiv="'.$key.'" content="'.$val.'" />'.$newline;
+	}
+
+	return $str;
+}
+
+
 
 
 ?>
\ No newline at end of file
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 9010a06a3..3ca597460 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -442,9 +442,9 @@ function redirect($uri = '', $method = 'location')
 {
 	switch($method)
 	{
-		case 'refresh' : header("Refresh:0;url=".site_url($uri));
+		case 'refresh'	: header("Refresh:0;url=".site_url($uri));
 			break;
-		default		: header("location:".site_url($uri));
+		default			: header("location:".site_url($uri));
 			break;
 	}
 	exit;
diff --git a/system/scaffolding/views/header.php b/system/scaffolding/views/header.php
index 7ab60fd81..50f234a49 100644
--- a/system/scaffolding/views/header.php
+++ b/system/scaffolding/views/header.php
@@ -8,8 +8,6 @@
 <?php $this->file(BASEPATH.'scaffolding/views/stylesheet.css'); ?>
 </style>
 
-<script src="../../nav.js" type="text/javascript"></script>
-
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv='expires' content='-1' />
 <meta http-equiv= 'pragma' content='no-cache' />
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 26d340b98..644f24fea 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -62,6 +62,14 @@ Change Log
 
 <h1>Change Log</h1>
 
+<h2>Version 1.5.0.2</h2>
+<p>Release Date: November 4, 2006</p>
+<ul>
+<li>Fixed a bug in the active record class that was not resetting query data after a completed query.</li>
+<li>Fixed a bug that was supressing errors in controllers.</li>
+</ul>
+
+
 <h2>Version 1.5.0.1</h2>
 <p>Release Date: October 31, 2006</p>
 <ul>
-- 
cgit v1.2.3-24-g4f1b