Merge branch 'release' into upstream

2 files changed, 4 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 11c4b4f..44934c0 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -664,6 +664,8 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         }
         ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cache.getType().markerId), null, null, null);
 
+        // reset imagesList so Images view page will be redrawn
+        imagesList = null;
         reinitializeViewPager();
 
         // rendering done! remove progress popup if any there
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index c17448f..66345da 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -326,7 +326,8 @@ class GpxExport extends AbstractExport {
                         "type", log.type.type);
 
                 gpx.startTag(PREFIX_GROUNDSPEAK, "finder");
-                gpx.attribute("", "id", log.author);
+                gpx.attribute("", "id", "");
+                gpx.text(log.author);
                 gpx.endTag(PREFIX_GROUNDSPEAK, "finder");
 
                 gpx.startTag(PREFIX_GROUNDSPEAK, "text");