# HG changeset patch
# User Dan
# Date 1189196860 14400
# Node ID 9de392a67964d9ae556f468a6f383df848b3d932
# Parent  0c5efda996bf5607057cf7149d982a53d2e5d86f
Merging Scribus and Nighthawk repositories

diff -r 0c5efda996bf -r 9de392a67964 index.php
diff -r 0c5efda996bf -r 9de392a67964 install.php
diff -r 0c5efda996bf -r 9de392a67964 plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Fri Sep 07 16:25:16 2007 -0400
+++ b/plugins/SpecialAdmin.php	Fri Sep 07 16:27:40 2007 -0400
@@ -2531,7 +2531,6 @@
       'icon_26' : '<?php echo scriptPath; ?>/images/icons/minusbottom.gif',// junction for opened node
       'icon_27' : '<?php echo scriptPath; ?>/images/icons/minus.gif'       // junction for last opended node
     };
-    addOnloadHook(keepalive_onload);
     <?php
     echo $paths->parseAdminTree(); // Make a Javascript array that defines the tree
     if(!isset($_GET['module'])) { echo 'addOnloadHook(_enanoAdminOnload);'; } ?>
diff -r 0c5efda996bf -r 9de392a67964 plugins/SpecialSearch.php
diff -r 0c5efda996bf -r 9de392a67964 plugins/SpecialUserFuncs.php
diff -r 0c5efda996bf -r 9de392a67964 plugins/SpecialUserPrefs.php
diff -r 0c5efda996bf -r 9de392a67964 upgrade.php
diff -r 0c5efda996bf -r 9de392a67964 upgrade.sql