--- tikiwiki-1.8.5/tiki-mailin-code.php	2004-12-31 18:04:50.000000000 -0600
+++ tikitemp/tiki-mailin-code.php	2005-07-15 10:24:27.098497080 -0500
@@ -26,7 +26,7 @@
     for ($i = 0; $i < count($obj->parts); $i++)
       mailin_parse_output($obj->parts[$i], $parts, $i);
   } else {
-    $ctype = $obj->ctype_primary . '/' . $obj->ctype_secondary;
+    $ctype = strtolower($obj->ctype_primary . '/' . $obj->ctype_secondary);
 
     switch ($ctype) {
     case 'text/plain':
@@ -74,7 +74,13 @@
 function check_attachments(&$output, &$out, $page, $user) {
   global  $wikilib;
   $cnt = 0;
-  for ($it = 0; $it < count($output->parts); $it++)
+
+  if (!empty($output->parts))
+    $num_parts = count($output->parts);
+  else
+    $num_parts = 0; // just skip the loop
+
+  for ($it = 0; $it < $num_parts; $it++)
   {
     if (isset($output->parts[$it]->d_parameters["filename"]))
     {
@@ -151,6 +157,9 @@
         case 'wiki-append':
           $method = 'APPEND';
         break;
+        case 'wiki-prepend':
+          $method = 'PREPEND';
+        break;
         case 'wiki':    
           $parts = explode(':', $page);
           if (!isset($parts[1])) {
--- tikiwiki-1.8.5/lib/tikilib.php	2005-01-20 07:51:29.000000000 -0600
+++ tikitemp/lib/tikilib.php	2005-07-15 10:27:31.109523152 -0500
@@ -4880,7 +4880,11 @@
     // Use largest version +1 in history table rather than tiki_page because versions used to be bugged
     include_once ('lib/wiki/histlib.php');
 //    $old_version = $info["version"];
-	$old_version = $histlib->get_page_latest_version($pageName) + 1;
+    // This code can be passed more than once during a single session, so
+    // for subsequent passes, we have to create the $histlib object manually
+    if (! isset ($histlib))
+        $histlib = new HistLib($dbTiki);
+    $old_version = $histlib->get_page_latest_version($pageName) + 1;
     $lastModif = $info["lastModif"];
     $user = $info["user"];
     $ip = $info["ip"];
--- tikiwiki-1.8.5/lib/userslib.php	2004-11-29 21:52:40.000000000 -0600
+++ tikitemp/lib/userslib.php	2005-07-15 10:28:50.865398416 -0500
@@ -1177,9 +1177,9 @@
     }
 
     function get_user_by_email($email) {
-    $query = "select `login` from `users_users` where `email`=?";
-    $pass = $this->getOne($query, array($email));
-    return $pass;
+        $query = "select `login` from `users_users` where `email`=?";
+        $pass = $this->getOne($query, array(trim($email)));
+        return $pass;
     }
 
     function is_due($user) {