From 1c09a892801bc60f95ce6175f2231b7284d8ad80 Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Tue, 22 Feb 2011 11:30:09 -0800
Subject: [PATCH] Fixing MediaPicker error when there is no media folder for
 the tenant.

--HG--
branch : dev
---
 .../Orchard.MediaPicker/Controllers/AdminController.cs      | 4 ++--
 .../Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MediaPicker/Controllers/AdminController.cs
index 97da43f46..031a3d345 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Controllers/AdminController.cs
@@ -30,8 +30,8 @@ namespace Orchard.MediaPicker.Controllers {
         public Localizer T { get; set; }
 
         public ActionResult Index(string name, string mediaPath) {
-            IEnumerable<MediaFile> mediaFiles = _mediaService.GetMediaFiles(mediaPath);
-            IEnumerable<MediaFolder> mediaFolders = _mediaService.GetMediaFolders(mediaPath);
+            var mediaFolders = _mediaService.GetMediaFolders(mediaPath);
+            var mediaFiles = string.IsNullOrEmpty(mediaPath) ? null : _mediaService.GetMediaFiles(mediaPath);
             var model = new MediaFolderEditViewModel { FolderName = name, MediaFiles = mediaFiles, MediaFolders = mediaFolders, MediaPath = mediaPath };
             ViewData["Service"] = _mediaService;
             return View(model);
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
index b38029f19..6075a0125 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
@@ -42,8 +42,9 @@
                         </td>
                     </tr>
                 }
-                @foreach (var mediaFile in Model.MediaFiles) {
-                    var src = (((IMediaService)ViewData["Service"]).GetPublicUrl(Path.Combine(Model.MediaPath, mediaFile.Name)));
+                @if (Model.MediaFiles != null) {
+                    foreach (var mediaFile in Model.MediaFiles) {
+                        var src = (((IMediaService)ViewData["Service"]).GetPublicUrl(Path.Combine(Model.MediaPath, mediaFile.Name)));
                     <tr data-imgsrc="@src" class="media-item">
                         <td class="media-thumbnail">
                             <img data-filename="@src.Substring(src.LastIndexOf("/") + 1)" alt="" src="@src" onload="jQuery.mediaPicker.scalePreview(this)" />
@@ -56,6 +57,7 @@
                             </ul>
                         </td>
                     </tr>
+                    }
                 }
             </table>
             </div>