Bladeren bron

fix: conflict between files with same basenames (e.g. ex.md ex.jpg)

master
Dom SP 3 jaren geleden
bovenliggende
commit
e62627d9f9
1 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. +5
    -5
      app/modules/filesinfolders.php

+ 5
- 5
app/modules/filesinfolders.php Bestand weergeven

@@ -134,7 +134,7 @@ class FilesInFolders {
$str = self::content_element_dispatcher($str);
$str = $md->text($str);
//$str = sprintf("%s", $str);
$this->content[$domain][$key] = sprintf(
$this->content[$domain][$key."30text"] = sprintf(
"<div class=\"item %s %s\">%s</div>",
$page,
$key,
@@ -145,7 +145,7 @@ class FilesInFolders {
$str = file_get_contents($file);
$str = \Template::instance()->render($file);
$str = self::linkify($str);
$this->content[$domain][$key] = sprintf(
$this->content[$domain][$key."00tpl"] = sprintf(
"<div class=\"item %s %s\">%s</div>",
$page,
$key,
@@ -158,7 +158,7 @@ class FilesInFolders {
;
if ($bulkIncludePic) {
foreach($this->structs[$domain_key]['pic'] as $key=>$file) {
$this->content[$domain][$key] = sprintf(
$this->content[$domain][$key."10image"] = sprintf(
"<img class=\"bulkImportedImage $bulkIncludePic\" src=\"/$file\" />"
);
}
@@ -169,7 +169,7 @@ class FilesInFolders {
;
if ($bulkIncludeAudio) {
foreach ($this->structs[$domain_key]['audio'] as $key=>$file) {
$this->content[$domain][$key] = sprintf(
$this->content[$domain][$key."20audio"] = sprintf(
'<a href="%s" class="audio">%s</a><br>',
$file, $key
);
@@ -186,7 +186,7 @@ class FilesInFolders {
$str .= sprintf("<tr>%s</tr>",$tmp);
}
$str.="</table>";
$this->content[$domain][$key] = $str;
$this->content[$domain][$key."30csv"] = $str;
}
}
}

Laden…
Annuleren
Opslaan