[PHP-DOC] cvs: livedocs / error.php livedoc.php

[Nuno Lopes]

nlopess         Thu Feb 19 09:38:05 2004 EDT

  Modified files:              
    /livedocs   error.php livedoc.php 
  Log:
  use FORCE_DYNAMIC option
  
http://cvs.php.net/diff.php/livedocs/error.php?r1=1.8&r2=1.9&ty=u
Index: livedocs/error.php
diff -u livedocs/error.php:1.8 livedocs/error.php:1.9
--- livedocs/error.php:1.8      Wed Feb 18 13:40:34 2004
+++ livedocs/error.php  Thu Feb 19 09:38:05 2004
@@ -18,7 +18,7 @@
 // | Handles the 404 error and try to redirect to the good place.         |
 // +----------------------------------------------------------------------+
 //
-// $Id: error.php,v 1.8 2004/02/18 18:40:34 didou Exp $
+// $Id: error.php,v 1.9 2004/02/19 14:38:05 nlopess Exp $
 
 /* handle IIS style 404 handler */
 if (strncmp($_SERVER['SERVER_SOFTWARE'], "Microsoft", 9) == 0 &&
@@ -100,10 +100,8 @@
        $current_page = preg_replace('|\.html$|', '', $current_page);
        if (preg_match('|([A-Za-z_]{2,5})/(.*)|', $current_page, $m)) {
                $current_page = preg_replace(IDREG, '', $m[2]);
-               $save_url = TRUE;
        } else if (preg_match('|(.*)|', $current_page, $m)) {
                $current_page = preg_replace(IDREG, '', $m[1]);
-               $save_url = TRUE;
        } else {
                $current_page = 'manual';
        }
http://cvs.php.net/diff.php/livedocs/livedoc.php?r1=1.80&r2=1.81&ty=u
Index: livedocs/livedoc.php
diff -u livedocs/livedoc.php:1.80 livedocs/livedoc.php:1.81
--- livedocs/livedoc.php:1.80   Mon Feb 16 12:54:59 2004
+++ livedocs/livedoc.php        Thu Feb 19 09:38:05 2004
@@ -18,7 +18,7 @@
 // | Generate an HTML version of a phpdoc/docbook page on the fly         |
 // +----------------------------------------------------------------------+
 //
-// $Id: livedoc.php,v 1.80 2004/02/16 17:54:59 derick Exp $
+// $Id: livedoc.php,v 1.81 2004/02/19 14:38:05 nlopess Exp $
  
 define('LIVEDOC_SOURCE', dirname(__FILE__));
 include LIVEDOC_SOURCE . '/common.php';
@@ -90,7 +90,7 @@
 /*****************************************************************************
  * Grabbing the output for normal or special pages
  */
-if ($save_url) {
+if (!FORCE_DYNAMIC) {
        ob_start();
 }
 
@@ -112,7 +112,7 @@
 /*****************************************************************************
  * Saving the generated page to the cache
  */
-if ($save_url) {
+if (!FORCE_DYNAMIC) {
        $contents = ob_get_contents();
        ob_clean();
        $f = fopen($lang . "/" . $current_page . ".html", 'w');