From d405035d40a5d59e99262f5bbc7cf7ea05e7e680 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Fri, 9 Sep 2011 09:24:23 +0000
Subject: [PATCH] fix for autosave

---
 docs/NEWS | 3 +++
 index.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index dbcc6cb7..319adad8 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -7,6 +7,9 @@ Version 1.7 ()
 Version 1.6 ()
 ------------------------------------------------------------------------
 
+    * Fix problem with autosave plugin used in conjunction with
+      entryproperties (chrisbra)
+      
     * Removed browsercompatibilitty plugin because it's outdated and
       IE6 shall be dead.
       
diff --git a/index.php b/index.php
index e7316cf3..7d3ad066 100644
--- a/index.php
+++ b/index.php
@@ -251,10 +251,11 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
     }
 
     echo $data;
-} else if ( preg_match(PAT_COMMENTSUB, $uri, $matches) ||
+} else if ( (preg_match(PAT_COMMENTSUB, $uri, $matches) ||
             preg_match(PAT_PERMALINK, $uri, $matches) ||
             isset($serendipity['GET']['id']) ||
-            isset($_GET['p']) ) {
+            isset($_GET['p']))
+            && !preg_match('/autosave/', $serendipity['uriArguments'][1]) ) {
     $serendipity['view'] = 'entry';
 
     if (isset($serendipity['GET']['id'])) {