git-svn-id: http://piwigo.org/svn/trunk@2485 68402e56-0260-453c-a942-…

…63ccdbb3a9ee
Piwigo · Aug 23, 2008 · ebe89e0 · ebe89e0
1 parent 726529c
commit ebe89e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/admin/template/yoga/admin/history.tpl b/admin/template/yoga/admin/history.tpl
@@ -61,20 +61,16 @@
     {'File name'|@translate}
     <input name="filename" value="{$FILENAME}" type="text">
   </label>
+
+  <label>
+    {'Thumbnails'|@translate}
+    <select name="display_thumbnail">
+      {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
+    </select>
+  </label>
 
   <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
 </fieldset>
-<fieldset>
-  <legend>{'Display'|@translate}</legend>
-  <ul>
-    <li>
-      {'Thumbnails'|@translate}
-      <select name="display_thumbnail">
-        {html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
-      </select>
-    </li>
-  </ul>
-</fieldset>
 </form>
 
 {if isset($search_summary)}

diff --git a/upload.php b/upload.php
@@ -222,7 +222,7 @@ function validate_upload( $temp_name, $my_max_file_size,
   // creation of the "infos" field :
   // <infos author="Pierrick LE GALL" comment="my comment"
   //        date_creation="2004-08-14" name="" />
-  $xml_infos = '<infos';
+  $xml_infos = '<infos ';
   $xml_infos.= encodeAttribute('author', $_POST['author']);
   $xml_infos.= encodeAttribute('comment', $_POST['comment']);
   $xml_infos.= encodeAttribute('date_creation', $date_creation);