Changeset 3984:360a96edeef5

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

Files:

• admin/langs.php (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (2 diffs)
• inc/core/class.dc.modules.php (modified) (1 diff)

admin/langs.php

@@ -31 +31 @@
 $lang_install = function ($file) {
     $zip = new fileUnzip($file);
-    $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+    $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg.*|\.git.*|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
 
     if (!preg_match('/^[a-z]{2,3}(-[a-z]{2})?$/', $zip->getRootDir())) {

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;

inc/core/class.dc.modules.php

@@ -378 +378 @@
     {
         $zip = new fileUnzip($zip_file);
-        $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg|\.git|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+        $zip->getList(false, '#(^|/)(__MACOSX|\.svn|\.hg.*|\.git.*|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
 
         $zip_root_dir = $zip->getRootDir();