# HG changeset patch
# User Dan
# Date 1251179020 14400
# Node ID 90225c988124ff3750d53a2dc3e573a5bcf37376
# Parent  faef5e62e1e0bb40d4b9a55f78fb12a821cb7042# Parent  30d8bb88572d83f56a1169474a1728c8f3d0b787
Merging in work done on Charlie with upstream

diff -r 30d8bb88572d -r 90225c988124 ajax.php
--- a/ajax.php	Fri Aug 21 20:41:38 2009 -0400
+++ b/ajax.php	Tue Aug 25 01:43:40 2009 -0400
@@ -60,7 +60,7 @@
         $src = '';
       }
       
-      $auth_edit = ( $session->get_permissions('edit_page') && ( $session->get_permissions('even_when_protected') || !$paths->page_protected ) );
+      $auth_edit = ( $session->get_permissions('edit_page') && ( $session->get_permissions('even_when_protected') || !$page->ns->page_protected ) );
       $auth_wysiwyg = ( $session->get_permissions('edit_wysiwyg') );
       
       $return = array(
diff -r 30d8bb88572d -r 90225c988124 includes/clientside/static/editor.js
--- a/includes/clientside/static/editor.js	Fri Aug 21 20:41:38 2009 -0400
+++ b/includes/clientside/static/editor.js	Tue Aug 25 01:43:40 2009 -0400
@@ -441,7 +441,8 @@
   form.appendChild(preview_anchor);
   form.appendChild(preview_container);
   form.appendChild(ta_wrapper);
-  form.appendChild(tblholder);
+  if ( !readonly )
+    form.appendChild(tblholder);
   form.innerHTML += '<div style="margin: 10px 0 0 0;">' + toolbar + '</div>';
   edcon.appendChild(form);