Merge branch 'working'

3 files changed, 18 insertions, 4 deletions

diff --git a/application/models/index.html b/application/models/index.html
index c942a79ce..c942a79ce 100755..100644
--- a/application/models/index.html
+++ b/application/models/index.html
diff --git a/application/models/mfile.php b/application/models/mfile.php
index e862f1930..e70b5c812 100644
--- a/application/models/mfile.php
+++ b/application/models/mfile.php
@@ -476,11 +476,29 @@ class Mfile extends CI_Model {
 			$extension = substr($name, strrpos($name, ".") + 1);
 
 			$extensionarray = array(
+				'awk' => 'awk',
+				'c' => 'c',
 				'coffee' => 'coffee-script',
+				'cpp' => 'cpp',
+				'diff' => 'diff',
+				'h' => 'c',
+				'hs' => 'haskell',
+				'html' => 'xml',
+				'java' => 'java',
+				'js' => 'js',
+				'lua' => 'lua',
 				'mli' => 'ocaml',
 				'mll' => 'ocaml',
 				'ml' => 'ocaml',
 				'mly' => 'ocaml',
+				'patch' => 'diff',
+				'php' => 'php',
+				'pl' => 'perl',
+				'py' => 'python',
+				'rb' => 'ruby',
+				's' => 'asm',
+				'sh' => 'bash',
+				'svg' => 'xml',
 				'tcl' => 'tcl',
 				'tex' => 'tex',
 			);
diff --git a/application/models/muser.php b/application/models/muser.php
index 2dd7280e8..7a3627b18 100644
--- a/application/models/muser.php
+++ b/application/models/muser.php
@@ -142,10 +142,6 @@ class Muser extends CI_Model {
 
 	function get_email($userid)
 	{
-		if (!$this->duser->is_implemented("get_email")) {
-			return false;
-		}
-
 		return $this->duser->get_email($userid);
 	}