Separate thumbnails out into var/thumbs. This clears up some ambiguity in Item_Model and simplifies

file_proxy.  It also means we can stop munging file names in the var/resizes hierarchy.

In the process, rename "thumbnail" to "thumb" everywhere in honor of
Chad (well, ok because it's shorter)..

2 files changed, 4 insertions, 4 deletions

diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 61115b2a..5687d770 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -29,7 +29,7 @@ class info_block_Core {
     }
   }
 
-  public static function thumbnail_info($theme, $item) {
+  public static function thumb_info($theme, $item) {
     $results = "<li>Views: 321</li>";
     if ($item->owner) {
       $results .= "<li>";
diff --git a/modules/media_rss/views/feed.mrss.php b/modules/media_rss/views/feed.mrss.php
index 1207d3da..b554f8b3 100644
--- a/modules/media_rss/views/feed.mrss.php
+++ b/modules/media_rss/views/feed.mrss.php
@@ -22,9 +22,9 @@
       <link><?= url::abs_site("photos/$child->id") ?></link>
       <guid isPermaLink="true"><?= url::abs_site("photos/$child->id") ?></guid>
       <description><?= $child->description ?></description>
-      <media:thumbnail url="<?= $child->thumbnail_url(true) ?>"
-                       height="<?= $child->thumbnail_height ?>"
-                       width="<?= $child->thumbnail_width ?>"
+      <media:thumbnail url="<?= $child->thumb_url(true) ?>"
+                       height="<?= $child->thumb_height ?>"
+                       width="<?= $child->thumb_width ?>"
                        />
       <media:group>
         <media:content url="<?= $child->resize_url(true) ?>"