Merge branch 'develop'

Application/Home/View/Item/show.html

@@ -161,4 +161,4 @@
 <script src="__PUBLIC__/js/jquery.goup.min.js"></script>
 <script src="__PUBLIC__/js/jquery.hotkeys.js"></script>
 
-<script src="__PUBLIC__/js/item/show.js?v=1.12thirdtt&3437788"></script>
+<script src="__PUBLIC__/js/item/show.js?v=1.12thirdtt&3437788999"></script>

Public/js/item/show.js

@@ -137,7 +137,12 @@ $(function(){
       $("#delete-link").attr("href" , base_url+"/home/page/delete/page_id/"+page_id);
       
       var domain = item_domain ? item_domain : item_id ;
-      var cur_page_url =  window.location.protocol +"//"+window.location.host+base_url+"/"+domain+"&page_id="+page_id;
+      var cur_page_url =  window.location.protocol +"//"+window.location.host+base_url+"/"+domain;
+      if(cur_page_url.indexOf("?")){
+        cur_page_url += "&page_id="+page_id;
+      }else{
+        cur_page_url += "?page_id="+page_id;
+      }
       $("#share-page-link").html(cur_page_url);
       history.replaceState(null, null, cur_page_url);