# HG changeset patch
# User Dan
# Date 1214528425 14400
# Node ID 0f6f1ace701fe7b398658ac50885a3a0b5339ccd
# Parent  499193a6dbe4a4d7feb98267455a2965b5639a94# Parent  a21faa57e6c6fa772f2b8f3156f1a54272e38b4f
Merging scribus and nighthawk branches

diff -r a21faa57e6c6 -r 0f6f1ace701f includes/clientside/static/dropdown.js
--- a/includes/clientside/static/dropdown.js	Thu Jun 12 10:58:48 2008 -0400
+++ b/includes/clientside/static/dropdown.js	Thu Jun 26 21:00:25 2008 -0400
@@ -140,7 +140,7 @@
   }
   if(obj.nextSibling.tagName.toLowerCase() == 'ul' || ( obj.nextSibling.tagName.toLowerCase() == 'div' && obj.nextSibling.className == 'submenu' ))
   {
-    $(a).addClass('liteselected');
+    $(obj).addClass('liteselected');
     //obj.className = 'liteselected';
     var ul = obj.nextSibling;
     var dim = fetch_dimensions(obj);
diff -r a21faa57e6c6 -r 0f6f1ace701f includes/wikiformat.php
--- a/includes/wikiformat.php	Thu Jun 12 10:58:48 2008 -0400
+++ b/includes/wikiformat.php	Thu Jun 26 21:00:25 2008 -0400
@@ -154,7 +154,7 @@
         
         chdir($d);
 
-        $obj =& new $class($rules);
+        $obj = new $class($rules);
         return $obj;
     }
 
@@ -514,7 +514,7 @@
             }
         }
 
-        $this->parseObj[$rule] =& new $class($this);
+        $this->parseObj[$rule] = new $class($this);
 
     }
 
@@ -536,7 +536,7 @@
             }
         }
 
-        $this->renderObj[$rule] =& new $class($this);
+        $this->renderObj[$rule] = new $class($this);
     }
 
     function loadFormatObj($format)
@@ -556,7 +556,7 @@
             }
         }
 
-        $this->formatObj[$format] =& new $class($this);
+        $this->formatObj[$format] = new $class($this);
     }
 
     function addPath($type, $dir)