Reflect recent master changes

ajax/documentController.php

@@ -90,13 +90,16 @@ class DocumentController extends Controller{
 	public static function listAll(){
 		self::preDispatch();
 		
-		$documents = Storage::getDocuments();
+		$found = Storage::getDocuments();
 
 		$fileIds = array();
-		
-		//$previewAvailable = \OCP\Preview::show($file);
-		foreach ($documents as $key=>$document) {
-			//\OCP\Preview::show($document['path']);
+		$documents = array();
+		foreach ($found as $key=>$document) {
+			if (is_object($document)){
+				$documents[] = $document->getData();
+			} else {
+				$documents[$key] = $document;
+			}
 			$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OC_Helper::mimetypeIcon($document['mimetype']));
 			$fileIds[] = $document['fileid'];
 		}

js/documents.js

@@ -714,9 +714,9 @@ var Files = Files || {
 
 		if ( $('#isPublic').length ) {
 			urlSpec.t = $('#dirToken').val();
-			previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec);
+			previewURL = OC.generateUrl('core_ajax_public_preview/{url_spec}', {url_spec : urlSpec});
 		} else {
-			previewURL = OC.Router.generate('core_ajax_preview', urlSpec);
+			previewURL = OC.generateUrl('core_ajax_preview/{url_spec}', {url_spec : urlSpec});
 		}
 		previewURL = previewURL.replace('(', '%28');
 		previewURL = previewURL.replace(')', '%29');