From e80077841cd2807456adcb0a99b67dc7f0fa2546 Mon Sep 17 00:00:00 2001
From: mohrt <mohrt@localhost>
Date: Wed, 5 Jun 2002 13:17:18 +0000
Subject: [PATCH] fix 304 Not Modified, don't send content

---
 NEWS                  | 6 ++++--
 Smarty.class.php      | 2 +-
 docs/designers.sgml   | 2 +-
 libs/Smarty.class.php | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 7ee1cb68..325059da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
-    - fixed cycle function to respect delimiter setting
-      after initial setting (Monte)
+    - fixed bug with 304 Not Modified response sending
+      content (Monte)
+    - fixed cycle function to respect delimiter after
+      initial setting (Monte)
     - update $GLOBALS references to work properly with
       track_globals settings (Michal Prinke, Monte)
     - fixed bug in math function with call to assign
diff --git a/Smarty.class.php b/Smarty.class.php
index 44e39703..43e065c9 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -607,9 +607,9 @@ class Smarty
                             header("HTTP/1.1 304 Not Modified");
                         } else {
                             header("Last-Modified: ".$gmt_mtime);
+                    		echo $_smarty_results;
                         }
                     }
-                    echo $_smarty_results;
                     error_reporting($_smarty_old_error_level);
                     return true;    
                 } else {
diff --git a/docs/designers.sgml b/docs/designers.sgml
index 11f2c55d..5ce9be19 100644
--- a/docs/designers.sgml
+++ b/docs/designers.sgml
@@ -3729,7 +3729,7 @@ OUTPUT:
             variables used in the equation are passed as parameters, which can
             be template variables or static values. +, -, /, *, abs, ceil, cos,
             exp, floor, log, log10, max, min, pi, pow, rand, round, sin, sqrt,
-            srans and tan are all valid operators. Check the PHP documenation
+            srans and tan are all valid operators. Check the PHP documentation
             for further information on these math functions.
 			</para>
 			<para>
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 44e39703..43e065c9 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -607,9 +607,9 @@ class Smarty
                             header("HTTP/1.1 304 Not Modified");
                         } else {
                             header("Last-Modified: ".$gmt_mtime);
+                    		echo $_smarty_results;
                         }
                     }
-                    echo $_smarty_results;
                     error_reporting($_smarty_old_error_level);
                     return true;    
                 } else {