[Boost-commit] svn:boost r80341 - in website/public_html/beta: . common/code

Subject: [Boost-commit] svn:boost r80341 - in website/public_html/beta: . common/code
From: dnljms_at_[hidden]
Date: 2012-08-31 18:46:03

Author: danieljames
Date: 2012-08-31 18:46:03 EDT (Fri, 31 Aug 2012)
New Revision: 80341
URL: http://svn.boost.org/trac/boost/changeset/80341

Log:
Website: Merge from live to beta
Properties modified: 
   website/public_html/beta/   (props changed)
Text files modified: 
   website/public_html/beta/common/code/boost_archive.php |    29 ++++++++++++++++++-----------           
   1 files changed, 18 insertions(+), 11 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	2012-08-31 18:46:03 EDT (Fri, 31 Aug 2012)
@@ -6,7 +6,7 @@
 */
 require_once(dirname(__FILE__) . '/boost.php');
 
-define('BOOST_DOCS_MODIFIED_DATE', 'Tue, 29 Nov 2011 10:09:34 +0000');
+define('BOOST_DOCS_MODIFIED_DATE', 'Fri, 31 Aug 2012 22:33:48 +0000');
 
 function get_archive_location(
     $pattern,
@@ -80,12 +80,17 @@
     // Calculate expiry date if requested.
 
     $expires = null;
-    if ($settings['use_http_expire_date'])
+    if ($params['use_http_expire_date'])
     {
-        $compare_version = BoostVersion::from($params['version'])->
-            compare(BoostVersion::current());
-        $expires = $compare_version === -1 ? "+1 year" :
-            ($compare_version === 0 ? "+1 week" : "+1 day");
+        if ($params['version'] == 'boost-build') {
+            $expires = "+1 week";
+        }
+        else {
+            $compare_version = BoostVersion::from($params['version'])->
+                compare(BoostVersion::current());
+            $expires = $compare_version === -1 ? "+1 year" :
+                ($compare_version === 0 ? "+1 week" : "+1 day");
+        }
     }
 
     // Check file exists.
@@ -164,8 +169,8 @@
         }
     }
     
-    if ($settings['override_extractor'])
-        $extractor = $settings['override_extractor'];
+    if ($params['override_extractor'])
+        $extractor = $params['override_extractor'];
 
     if (!$extractor) {
         file_not_found($params);
@@ -280,10 +285,12 @@
 // General purpose render callbacks.
 
 function boost_archive_render_callbacks($content, $params) {
-    $version = BoostVersion::from($params['version']);
-
     $charset = $params['charset'] ? $params['charset'] : 'us-ascii';
-    $title = $params['title'] ? "$params[title] - $version" : 'Boost C++ Libraries';
+    $title = $params['title'] ? "$params[title]" : 'Boost C++ Libraries';
+
+    if ($params['version'] != 'boost-build') {
+        $title = "$params[title] - " . BoostVersion::from($params['version']);
+    }
 
     $head = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=${charset}\" />\n";