Skip to content

unescape blogName when it's going to be displayed to the user #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniloercoli merged 1 commit into from
May 16, 2014
Merged

unescape blogName when it's going to be displayed to the user #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/wordpress/android/ui/accounts/ManageBlogsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View rowView = inflater.inflate(mResource, parent, false);
CheckedTextView nameView = (CheckedTextView) rowView.findViewById(R.id.blog_name);
String name = MapUtils.getMapStr(getItem(position), "blogName");
String name = StringUtils.unescapeHTML(MapUtils.getMapStr(getItem(position), "blogName"));
if (name.trim().length() == 0) {
name = MapUtils.getMapStr(getItem(position), "url");
name = StringUtils.getHost(name);
Expand Down
2 changes: 1 addition & 1 deletion src/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ protected void onCreate(Bundle savedInstanceState) {
public void onPageSelected(int position) {
invalidateOptionsMenu();
if (position == PAGE_CONTENT) {
setTitle(WordPress.getCurrentBlog().getBlogName());
setTitle(StringUtils.unescapeHTML(WordPress.getCurrentBlog().getBlogName()));
} else if (position == PAGE_SETTINGS) {
setTitle(mPost.isPage() ? R.string.page_settings : R.string.post_settings);
} else if (position == PAGE_PREVIEW) {
Expand Down