From c044d301ea523abfa1d2ad3a17578821c6afb903 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 May 2015 04:34:03 -0400
Subject: [PATCH] Fix blank image in html_signature when saving identity changes (#1490412)
---
CHANGELOG | 1 +
program/steps/settings/save_identity.inc | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 002b07b..6302fb2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
- Fix attached file path unsetting in database_attachments plugin (#1490393)
- Fix issues when using moduserprefs.sh without --user argument (#1490399)
- Fix potential info disclosure issue by protecting directory access (#1490378)
+- Fix blank image in html_signature when saving identity changes (#1490412)
RELEASE 1.1.1
-------------
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 72c2597..1fc1040 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -208,7 +208,7 @@
global $RCMAIL;
$offset = 0;
- $regexp = '/\s(poster|src)\s*=\s*[\'"]*\S+upload-display\S+file=rcmfile([0-9]+)[\s\'"]*/';
+ $regexp = '/\s(poster|src)\s*=\s*[\'"]*\S+upload-display\S+file=rcmfile(\w+)[\s\'"]*/';
while (preg_match($regexp, $html, $matches, 0, $offset)) {
$file_id = $matches[2];
--
Gitblit v1.9.1