[phplib-dev] cvs commit From: kk (phplib-dev <email protected>)
Date: 07/12/00

From: kk
Date: Wed Jul 12 20:10:34 2000
Modified files:
      php-lib-stable/php/session.inc
      php-lib-stable/php/template.inc

Log message:
- template.inc: Made it like Thies said it should be.
- session.inc: Made it so that MSIE likes it, I hope.

Index: php-lib-stable/php/session.inc
diff -u php-lib-stable/php/session.inc:1.3 php-lib-stable/php/session.inc:1.4
--- php-lib-stable/php/session.inc:1.3 Wed Jun 28 18:43:42 2000
+++ php-lib-stable/php/session.inc Wed Jul 12 20:10:03 2000
@@ -5,7 +5,7 @@
  * Copyright (c) 1998,1999 SH Online Dienst GmbH
  * Boris Erdmann, Kristian Koehntopp
  *
- * $Id: session.inc,v 1.3 2000/06/28 16:43:42 athompso Exp $
+ * $Id: session.inc,v 1.4 2000/07/12 18:10:03 kk Exp $
  *
  */
 
@@ -422,6 +422,7 @@
         $mod_gmt = gmdate("D, d M Y H:i:s", getlastmod()) . " GMT";
         header("Last-Modified: " . $mod_gmt);
         # possibly ie5 needs the pre-check line. This needs testing.
+ header("Cache-Control: post-check=0, pre-check=0");
       break;
 
       case "public":
Index: php-lib-stable/php/template.inc
diff -u php-lib-stable/php/template.inc:1.3 php-lib-stable/php/template.inc:1.4
--- php-lib-stable/php/template.inc:1.3 Wed Jul 12 13:17:29 2000
+++ php-lib-stable/php/template.inc Wed Jul 12 20:10:03 2000
@@ -5,7 +5,7 @@
  * (C) Copyright 1999 NetUSE GmbH
  * Kristian Koehntopp
  *
- * $Id: template.inc,v 1.3 2000/07/12 11:17:29 kk Exp $
+ * $Id: template.inc,v 1.4 2000/07/12 18:10:03 kk Exp $
  *
  */
 
@@ -104,9 +104,9 @@
       $name = $handle;
 
     $str = $this->get_var($parent);
- $reg = "/<!--\s+BEGIN $handle\s+-->(.*)<!--\s+END $handle\s+-->/sm";
+ $reg = "/<!--\s+BEGIN $handle\s+-->(.*)\n\s*<!--\s+END $handle\s+-->/sm";
     preg_match_all($reg, $str, $m);
- $str = preg_replace($reg, "\{$name}", $str);
+ $str = preg_replace($reg, "{" . "$name}", $str);
     $this->set_var($handle, $m[1][0]);
     $this->set_var($parent, $str);
   }

---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>