aboutsummaryrefslogtreecommitdiff
path: root/libs/utils/WordPressUtils/src/main/java/org/wordpress
diff options
context:
space:
mode:
authorMaxime Biais <maxime.biais@gmail.com>2016-07-11 10:05:58 +0200
committerMaxime Biais <maxime.biais@gmail.com>2016-07-11 10:05:58 +0200
commit1e9bdaf3f7c42192d64cc828789ec60d8fb21889 (patch)
treed46f92ac7f29138496cdfdd80bcba7fe739b5ad9 /libs/utils/WordPressUtils/src/main/java/org/wordpress
parent126a26a697147729a8c2b4c4f061e4a795c5df75 (diff)
parent53221571af61fbbc8a5c918c7c5500017046fba6 (diff)
downloadgradle-perf-android-medium-1e9bdaf3f7c42192d64cc828789ec60d8fb21889.tar.gz
Merge branch 'hotfix/5.5.1' into release/5.6
Diffstat (limited to 'libs/utils/WordPressUtils/src/main/java/org/wordpress')
-rw-r--r--libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java
index b14aa90da..b57ad0165 100644
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java
+++ b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java
@@ -330,8 +330,8 @@ public class MediaFile {
fullSizeUrl, mediaTitle, alignmentCSS, resizedPictureURL);
if (!TextUtils.isEmpty(getCaption())) {
- content = String.format("[caption id=\"\" align=\"%s\" width=\"%d\" caption=\"%s\"]%s[/caption]",
- alignment, getWidth(), TextUtils.htmlEncode(getCaption()), content);
+ content = String.format("[caption id=\"\" align=\"%s\" width=\"%d\"]%s%s[/caption]",
+ alignment, getWidth(), content, TextUtils.htmlEncode(getCaption()));
}
return content;