Changeset 3984:360a96edeef5 for inc/core/class.dc.media.php

Timestamp:

06/28/19 10:59:20 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with various git/hg directories to ignore in zip archive

File:

• inc/core/class.dc.media.php (modified) (2 diffs)

inc/core/class.dc.media.php

@@ -921 +921 @@
         $zip = new fileUnzip($f->file);
         $zip->setExcludePattern($this->exclude_pattern);
-        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg|\.git|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg.*|\.git.*|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
 
         if ($create_dir) {
@@ -973 +973 @@
     {
         $zip  = new fileUnzip($f->file);
-        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg|\.git|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+        $list = $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg.*|\.git.*|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
         $zip->close();
         return $list;