# HG changeset patch
# User Dan
# Date 1215468781 14400
# Node ID ec9385bb7243f7d65ff137a87dcb3fa0010979cb
# Parent  935f3799b654105a194e8d12ec4e78e143ee9180# Parent  daf8c556ada7f44bfa5ad4db1c4acc94312b9059
Merging nighthawk and scribus branches (now that nighthawk isn't panicked anymore)

diff -r 935f3799b654 -r ec9385bb7243 includes/functions.php
--- a/includes/functions.php	Mon Jul 07 18:12:30 2008 -0400
+++ b/includes/functions.php	Mon Jul 07 18:13:01 2008 -0400
@@ -579,6 +579,23 @@
   return $arr;
 }
 
+/**
+ * Implementation of array_merge() that preserves key names. $arr2 takes precedence over $arr1.
+ * @param array $arr1
+ * @param array $arr2
+ * @return array
+ */
+
+function enano_safe_array_merge($arr1, $arr2)
+{
+  $arr3 = $arr1;
+  foreach($arr2 as $k => $v)
+  {
+    $arr3[$k] = $v;
+  }
+  return $arr3;
+}
+
 // Convert IP address to hex string
 // Input:  127.0.0.1  (string)
 // Output: 0x7f000001 (string)
diff -r 935f3799b654 -r ec9385bb7243 includes/search.php
--- a/includes/search.php	Mon Jul 07 18:12:30 2008 -0400
+++ b/includes/search.php	Mon Jul 07 18:13:01 2008 -0400
@@ -14,23 +14,6 @@
  */
 
 /**
- * Implementation of array_merge() that preserves key names. $arr2 takes precedence over $arr1.
- * @param array $arr1
- * @param array $arr2
- * @return array
- */
-
-function enano_safe_array_merge($arr1, $arr2)
-{
-  $arr3 = $arr1;
-  foreach($arr2 as $k => $v)
-  {
-    $arr3[$k] = $v;
-  }
-  return $arr3;
-}
-
-/**
  * In Enano versions prior to 1.0.2, this class provided a search function that was keyword-based and allowed boolean searches. It was
  * cut from Coblynau and replaced with perform_search(), later in this file, because of speed issues. Now mostly deprecated. The only
  * thing remaining is the buildIndex function, which is still used by the path manager and the new search framework.