Merged development into Master

includes/common.php

@@ -174,7 +174,8 @@ function upload($files, $CONF, $db)
   if (!empty($files)) {
       $filesize = filesize($files['file']['tmp_name']);
       $file_type = mime_content_type($files['file']['tmp_name']);
-      $ext = pathinfo($files['file']['name'], PATHINFO_EXTENSION);
+      //$ext = pathinfo($files['file']['name'], PATHINFO_EXTENSION);
+      $ext = substr($files['file']['name'], strrpos($files['file']['name'], '.')+1);
       if ($logged_in == 1)
       {
         $user_id = $user->id;
@@ -657,4 +658,4 @@ function multi_array_search($array, $search)
   // Return the result array
   return $result;
 }
-?>
+?>