Fix bugs

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 8eb588b5986e29fa2e0052279671df29adc1b1fd..b4eae5fc039fc9daae17eea400f3397735efe178 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1897,6 +1897,7 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
         $props =& serendipity_fetchMediaProperties($media['image_id']);
 
         $show[$idx] =& $media['internal'];
+        $show[$idx]['image_id'] = $media['image_id'];
         serendipity_prepareMedia($show[$idx]);
 
         foreach($dprops AS $prop) {

diff --git a/templates/default/admin/media_properties.tpl b/templates/default/admin/media_properties.tpl
index 754c4346d65566de204b1e7b6cf622f92e5b9d58..b6efdcb781aa434251b98759d3f8ff6a47739f6f 100644 (file)
--- a/templates/default/admin/media_properties.tpl
+++ b/templates/default/admin/media_properties.tpl
@@ -1,7 +1,7 @@
 {if $media.is_edit}
 <form id="mediaPropertyForm" action="?" method="POST">
     <div>
-        <?php echo serendipity_setFormToken(); ?>
+        {$media.token}
         <input type="hidden" name="serendipity[action]"         value="admin" />
         <input type="hidden" name="serendipity[adminModule]"    value="images" />
         <input type="hidden" name="serendipity[adminAction]"    value="add" />