Updated legacy editor to place captions the same way as the web edito…

…r and visual editor (before the [/caption] closing tag)
wordpress-mobile · Jul 8, 2016 · 4767334 · 4767334
1 parent 5474629
commit 4767334
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPHtml.java b/WordPress/src/main/java/org/wordpress/android/util/WPHtml.java
@@ -463,8 +463,8 @@ public static String getContent(WPImageSpan imageSpan) {
 
             if (!caption.equals("")) {
                 content = String.format(Locale.US,
-                        "[caption id=\"\" align=\"%s\" width=\"%d\" caption=\"%s\"]%s[/caption]",
-                        alignment, width, TextUtils.htmlEncode(caption), content);
+                        "[caption id=\"\" align=\"%s\" width=\"%d\"]%s%s[/caption]",
+                        alignment, width, content, TextUtils.htmlEncode(caption));
             }
         }
 

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
@@ -330,8 +330,8 @@ public String getImageHtmlForUrls(String fullSizeUrl, String resizedPictureURL,
                 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;