diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-07-11 20:23:30 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-07-11 20:23:30 +0200 |
| commit | f6b442bba6666f3265680223e1ef9df08b94eb08 (patch) | |
| tree | 8297a8f4fb772e6a2b22a5262608ac3bd7e96cec | |
| parent | 817163a1bcff02285f763bcf72ff02e86f218cf8 (diff) | |
add 404 headers to show_404() proper instead of in the error_404.php template
| -rw-r--r-- | system/application/errors/error_404.php | 1 | ||||
| -rw-r--r-- | system/libraries/Exceptions.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 | ||||
| -rw-r--r-- | user_guide/installation/upgrade_172.html | 105 |
4 files changed, 107 insertions, 2 deletions
diff --git a/system/application/errors/error_404.php b/system/application/errors/error_404.php index bfe9444b2..1c513a205 100644 --- a/system/application/errors/error_404.php +++ b/system/application/errors/error_404.php @@ -1,4 +1,3 @@ -<?php header("HTTP/1.1 404 Not Found"); ?> <html> <head> <title>404 Page Not Found</title> diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php index 1f99d01c3..9c655a174 100644 --- a/system/libraries/Exceptions.php +++ b/system/libraries/Exceptions.php @@ -94,7 +94,7 @@ class CI_Exceptions { $message = "The page you requested was not found."; log_message('error', '404 Page Not Found --> '.$page); - echo $this->show_error($heading, $message, 'error_404'); + echo $this->show_error($heading, $message, 'error_404', 404); exit; } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e4199cd35..56081456f 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,6 +88,7 @@ SVN Revision: </p> <li>General <ul> <li>Modified <a href="general/errors.html">show_error()</a> to allow sending of HTTP server response codes.</li> + <li>Modified <a href="general/errors.html">show_404()</a> to send 404 status code, removing non-CGI compatible header() statement from error_404.php template.</li> <li>Added set_status_header() to the <a href="general/common_functions.html">Common functions<a> to allow use when the Output class is unavailable.</li> </ul> </li> diff --git a/user_guide/installation/upgrade_172.html b/user_guide/installation/upgrade_172.html new file mode 100644 index 000000000..ee775a33e --- /dev/null +++ b/user_guide/installation/upgrade_172.html @@ -0,0 +1,105 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<title>Upgrading from 1.7.1 to 1.7.2 : CodeIgniter User Guide</title> + +<style type='text/css' media='all'>@import url('../userguide.css');</style> +<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' /> + +<script type="text/javascript" src="../nav/nav.js"></script> +<script type="text/javascript" src="../nav/prototype.lite.js"></script> +<script type="text/javascript" src="../nav/moo.fx.js"></script> +<script type="text/javascript" src="../nav/user_guide_menu.js"></script> + +<meta http-equiv='expires' content='-1' /> +<meta http-equiv= 'pragma' content='no-cache' /> +<meta name='robots' content='all' /> +<meta name='author' content='ExpressionEngine Dev Team' /> +<meta name='description' content='CodeIgniter User Guide' /> + +</head> +<body> + +<!-- START NAVIGATION --> +<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div> +<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle_darker.jpg" width="154" height="43" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div> +<div id="masthead"> +<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> +<tr> +<td><h1>CodeIgniter User Guide Version 1.7.1</h1></td> +<td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td> +</tr> +</table> +</div> +<!-- END NAVIGATION --> + + +<!-- START BREADCRUMB --> +<table cellpadding="0" cellspacing="0" border="0" style="width:100%"> +<tr> +<td id="breadcrumb"> +<a href="http://codeigniter.com/">CodeIgniter Home</a> › +<a href="../index.html">User Guide Home</a> › +Upgrading from 1.7.1 to 1.7.2 +</td> +<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td> +</tr> +</table> +<!-- END BREADCRUMB --> + +<br clear="all" /> + + +<!-- START CONTENT --> +<div id="content"> + +<h1>Upgrading from 1.7.1 to 1.7.2</h1> + +<p>Before performing an update you should take your site offline by replacing the index.php file with a static one.</p> + + + +<h2>Step 1: Update your CodeIgniter files</h2> + +<p>Replace these files and directories in your "system" folder with the new versions:</p> + +<ul> + +<li><dfn>system/codeigniter</dfn></li> +<li><dfn>system/database</dfn></li> +<li><dfn>system/helpers</dfn></li> +<li><dfn>system/language</dfn></li> +<li><dfn>system/libraries</dfn></li> +</ul> + +<p class="important"><strong>Note:</strong> If you have any custom developed files in these folders please make copies of them first.</p> + +<h2>Step 2: Remove header() from 404 error template</h2> +<p>If you are using header() in your 404 error template, such as the case with the default <samp>error_404.php</samp> template shown below, remove that line of code.</p> + +<code><?php header("HTTP/1.1 404 Not Found"); ?></code> + +<p>404 status headers are now properly handled in the show_404() method itself.</p> + +<h2>Step 2: Update your user guide</h2> +<p>Please replace your local copy of the user guide with the new version, including the image files.</p> + +</div> +<!-- END CONTENT --> + + +<div id="footer"> +<p> +Previous Topic: <a href="index.html">Installation Instructions</a> + · +<a href="#top">Top of Page</a> · +<a href="../index.html">User Guide Home</a> · +Next Topic: <a href="troubleshooting.html">Troubleshooting</a> +</p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006-2009 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p> +</div> + +</body> +</html>
\ No newline at end of file |