From 6f4346734826d20008f2619aef73ed6537c136ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= Date: Mon, 25 Jan 2016 17:49:26 +0100 Subject: [PATCH] Avoid multiple uploads of the same file in confluence --- daux.phar | Bin 877507 -> 877516 bytes libs/Format/Confluence/ContentPage.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/daux.phar b/daux.phar index aee9b962db38d73cb767c8ed09baab109b36153f..06d73438af5069fa580704643ecf48d55cab720b 100755 GIT binary patch delta 4228 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 V_L9;=zv`Ppp6A?getPath()); //Add the attachment for later upload - $this->attachments[] = ['filename' => $filename, 'file' => $file]; + $this->attachments[$filename] = ['filename' => $filename, 'file' => $file]; return $this->createImageTag($filename, $attributes); }