Fixed more 1.1.6 bugs
authorDan
Thu, 16 Apr 2009 22:48:15 -0400
changeset 15 f0cf0b512fbb
parent 14 a5263dadedf3
child 16 3d96dbb770b5
Fixed more 1.1.6 bugs
plugins/Newsboy.php
--- a/plugins/Newsboy.php	Thu Apr 16 22:09:08 2009 -0400
+++ b/plugins/Newsboy.php	Thu Apr 16 22:48:15 2009 -0400
@@ -65,6 +65,7 @@
   $session->acl_extend_scope('upload_files',           'NewsBoy', $paths);
   $session->acl_extend_scope('upload_new_version',     'NewsBoy', $paths);
   $session->acl_extend_scope('create_page',            'NewsBoy', $paths);
+  $session->acl_extend_scope('html_in_pages',          'NewsBoy', $paths);
   $session->acl_extend_scope('php_in_pages',           'NewsBoy', $paths);
   $session->acl_extend_scope('edit_acl',               'NewsBoy', $paths);
   
@@ -215,7 +216,11 @@
       if ( ob_get_contents() == '' )
       {
         parent::send();
-      } 
+      }
+      // transfer OB to parent
+      $c = ob_get_contents();
+      ob_end_clean();
+      echo $c;
     }
   }
 }
@@ -836,14 +841,12 @@
           if(!$e) $db->_die('The page text entry could not be deleted.');
           $e = $db->sql_query('DELETE FROM '.table_prefix.'pages WHERE urlname=\''.$page_id.'\' AND namespace=\''.$namespace.'\'');
           if(!$e) $db->_die('The page entry could not be deleted.');
-          $e = $db->sql_query('DELETE FROM '.table_prefix.'files WHERE page_id=\''.$page_id.'\'');
-          if(!$e) $db->_die('The file entry could not be deleted.');
           
           $result = 'This page has been deleted. Note that there is still a log of edits and actions in the database, and anyone with admin rights can raise this page from the dead unless the log is cleared. If the deleted file is an image, there may still be cached thumbnails of it in the cache/ directory, which is inaccessible to users.';
           
           echo $result . '<br />
                <br />
-               <a href="#" onclick="ajaxPage(\'' . $paths->cpage['module'] . '\');">Return to Newsboy</a>';
+               <a href="#" onclick="ajaxPage(\'' . $paths->cpage['module'] . '\'); return false;">Return to Newsboy</a>';
         }
         else
         {
@@ -926,9 +929,10 @@
             $page = new PageProcessor((string)$time, 'NewsBoy');
             $page->create_page($name, $publ);
             
-            if ( $page->update_page($_POST['content'], 'Initial revision', false) )
+            if ( $page->update_page($_POST['content'], 'Initial revision', false, 'wikitext') )
             {
               echo '<div class="info-box">Your changes have been saved.</div>';
+              break;
             }
             else
             {
@@ -936,9 +940,8 @@
               {
                 $errors[] = $err;
               }
+              $done = false;
             }
-            
-            break;
           }
         }