Subject: [Boost-commit] svn:boost r63884 - website/public_html/beta/common/code
From: daniel_james_at_[hidden]
Date: 2010-07-11 13:39:20
Author: danieljames
Date: 2010-07-11 13:39:20 EDT (Sun, 11 Jul 2010)
New Revision: 63884
URL: http://svn.boost.org/trac/boost/changeset/63884
Log:
Fix file not found error for future documentation.
Text files modified:
website/public_html/beta/common/code/boost_archive.php | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
Modified: website/public_html/beta/common/code/boost_archive.php
==============================================================================
--- website/public_html/beta/common/code/boost_archive.php (original)
+++ website/public_html/beta/common/code/boost_archive.php 2010-07-11 13:39:20 EDT (Sun, 11 Jul 2010)
@@ -43,6 +43,11 @@
$content_map = array(),
$override_extractor = null)
{
+ $params['template'] = dirname(__FILE__)."/template.php";
+ $params['title'] = NULL;
+ $params['charset'] = NULL;
+ $params['content'] = NULL;
+
$info_map = array_merge($content_map, array(
array('@.*@','@[.](txt|py|rst|jam|v2|bat|sh|xml|qbk)$@i','text','text/plain'),
array('@.*@','@[.](c|h|cpp|hpp)$@i','cpp','text/plain'),
@@ -101,11 +106,6 @@
return;
}
- $params['template'] = dirname(__FILE__)."/template.php";
- $params['title'] = NULL;
- $params['charset'] = NULL;
- $params['content'] = NULL;
-
// Note: this sets $params['content'] with either the content or an error
// message:
if(!extract_file($unzip, $params['content'])) {
@@ -357,6 +357,13 @@
function file_not_found($params, $message = null)
{
+ if(is_string($params)) {
+ $params = Array(
+ 'file' => $params,
+ 'template' => dirname(__FILE__)."/template.php"
+ );
+ }
+
header("HTTP/1.0 404 Not Found");
display_template($params['template'],
new file_not_found_render_callbacks($params['file'], $message));