From f6b442bba6666f3265680223e1ef9df08b94eb08 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 11 Jul 2009 18:23:30 +0000 Subject: add 404 headers to show_404() proper instead of in the error_404.php template --- system/application/errors/error_404.php | 1 - system/libraries/Exceptions.php | 2 +- user_guide/changelog.html | 1 + user_guide/installation/upgrade_172.html | 105 +++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 user_guide/installation/upgrade_172.html 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 @@ - 404 Page Not Found 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:

  • General
    • 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 @@ + + + + + +Upgrading from 1.7.1 to 1.7.2 : CodeIgniter User Guide + + + + + + + + + + + + + + + + + + + + + +
    + + + + + +

    CodeIgniter User Guide Version 1.7.1

    +
    + + + + + + + + + +
    + + +
    + + + +
    + +

    Upgrading from 1.7.1 to 1.7.2

    + +

    Before performing an update you should take your site offline by replacing the index.php file with a static one.

    + + + +

    Step 1: Update your CodeIgniter files

    + +

    Replace these files and directories in your "system" folder with the new versions:

    + + + +

    Note: If you have any custom developed files in these folders please make copies of them first.

    + +

    Step 2: Remove header() from 404 error template

    +

    If you are using header() in your 404 error template, such as the case with the default error_404.php template shown below, remove that line of code.

    + +<?php header("HTTP/1.1 404 Not Found"); ?> + +

    404 status headers are now properly handled in the show_404() method itself.

    + +

    Step 2: Update your user guide

    +

    Please replace your local copy of the user guide with the new version, including the image files.

    + +
    + + + + + + + \ No newline at end of file -- cgit v1.2.3-24-g4f1b