Merge pull request #374 from rural21st/patch-7

Update RestController.class.php

Author: liu21st

ThinkPHP/Library/Think/Controller/RestController.class.php

@@ -104,6 +104,7 @@ public function __call($method, $args)
     protected function getAcceptType()
     {
         $type = array(
+            'html' => 'text/html,application/xhtml+xml,*/*',
             'xml'  => 'application/xml,text/xml,application/x-xml',
             'json' => 'application/json,text/x-json,application/jsonrequest,text/json',
             'js'   => 'text/javascript,application/javascript,application/x-javascript',
@@ -117,7 +118,6 @@ protected function getAcceptType()
             'jpg'  => 'image/jpg,image/jpeg,image/pjpeg',
             'gif'  => 'image/gif',
             'csv'  => 'text/csv',
-            'html' => 'text/html,application/xhtml+xml,*/*',
         );
 
         foreach ($type as $key => $val) {