Mercurial > hg > fapweb

changeset 964:280dc9b01297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Nov 2014 03:29:13 +0200
parents 003af1c4ae1f
children d5f3a505c73c
files faptool.php
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/faptool.php	Sat Nov 29 03:08:55 2014 +0200
+++ b/faptool.php	Sat Nov 29 03:29:13 2014 +0200
@@ -385,13 +385,13 @@
   if (wtMakeDir(stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"])), 0755) === false)
     return FALSE;
 
-  $dstFileBase = $useOrig ? $efile["id"]."--".$efile["origname"] : $efile["filename"];
+  $dstFileBase = $entry["show_id"]."--".($useOrig ? $efile["origname"] : $efile["filename"]);
 
   if ($edata["class"] == EFILE_ARCHIVE)
   {
     // Entry is an archive file ..
     $dstPath = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], stReplaceFileExt($dstFileBase, "")));
-    if (wtUnpackArchiveTo($efile["filetype"], $filename, $dstPath) === false)
+    if (wtUnpackArchiveTo($edata["id"], $filename, $dstPath) === false)
       return FALSE;
   }
   else