fix path and exif display issue

diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index c676097cee1360f3e2c211f3bff248f1738694ff..54db6ee783de8c45126454b3833d11ad5e9ad252 100644 (file)
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -524,7 +524,7 @@ function serendipity_smarty_rss_getguid($params, &$smarty) {
  * @return
  */
 function serendipity_smarty_formatTime($timestamp, $format, $useOffset = true, $detectTimestamp = false) {
-    if ($detectTimestamp && stristr($detectTimestamp, 'date') === false) {
+    if ($detectTimestamp !== false && stristr($detectTimestamp, 'date') === false) {
         return $timestamp;
     }
 

diff --git a/templates/default/admin/media_items.tpl b/templates/default/admin/media_items.tpl
index bc6c05353e0ffeb647349cc5ef0e0d37f4597c71..6afe8c2d6c430381ba6795e4e317badf8760bb5d 100644 (file)
--- a/templates/default/admin/media_items.tpl
+++ b/templates/default/admin/media_items.tpl
@@ -82,6 +82,7 @@
             <div>
                 <input type="hidden" name="serendipity[oldDir][{$mediakey}]" value="{$file.path|@escape}" />
                 <select id="newDir{$mediakey}" name="serendipity[newDir][{$mediakey}]">
+                <option value=""></option>
                 {foreach from=$media.paths item="folder"}
                 <option {if ($file.path == $folder.relpath)}selected="selected"{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:$folder.depth*2}{$folder.name}</option>
                 {/foreach}
@@ -113,14 +114,20 @@
         <dl>
         {foreach from=$file.metadata key="meta_type" item="meta_data"}
             <dt><h4>{$meta_type}</h4></dt>
-            <dd><table>
+            <dd>
+            {if is_array($meta_data)}
+            <table>
             {foreach from=$meta_data key="meta_name" item="meta_value"}
                 <tr>
-                    <td valign="top"><em>{$meta_name}</em></th>
+                    <td valign="top"><em>{$meta_name}!</em></th>
                     <td>{if is_array($meta_value)}<pre>{$meta_value|@print_r}</pre>{else}{$meta_value|@formatTime:DATE_FORMAT_SHORT:false:$meta_name}{/if}</td>
                 </tr>
             {/foreach}
-            </table></dd>
+            </table>
+            {else}
+            {$meta_data|@formatTime:DATE_FORMAT_SHORT:false:$meta_type}
+            {/if}
+            </dd>
         {/foreach}
         </dl>
         </div>

diff --git a/templates/default/admin/media_showitem.tpl b/templates/default/admin/media_showitem.tpl
index eafbaa7fb10e792cc90aa8f09da2f390c9bf3f02..8ee028c666e4f5c8b8554da2d8c603a4ada61f2b 100644 (file)
--- a/templates/default/admin/media_showitem.tpl
+++ b/templates/default/admin/media_showitem.tpl
@@ -56,14 +56,20 @@
                 <dl>
                 {foreach from=$media.file.props.base_metadata key="meta_type" item="meta_data"}
                     <dt><strong>{$meta_type}</strong></dt>
-                    <dd><table>
+                    <dd>
+                    {if is_array($meta_data)}
+                    <table>
                     {foreach from=$meta_data key="meta_name" item="meta_value"}
                         <tr>
-                            <td valign="top"><em>{$meta_name}</em></th>
+                            <td valign="top"><em>{$meta_name}!</em></th>
                             <td>{if is_array($meta_value)}<pre>{$meta_value|@print_r}</pre>{else}{$meta_value|@formatTime:DATE_FORMAT_SHORT:false:$meta_name}{/if}</td>
                         </tr>
                     {/foreach}
-                    </table></dd>
+                    </table>
+                    {else}
+                    {$meta_data|@formatTime:DATE_FORMAT_SHORT:false:$meta_type}
+                    {/if}
+                    </dd>
                 {/foreach}
                 </dl>
                 </div>