[1.1_STABLE] Escape ampersands in links in the wall

(cherry picked from commit 80eb31c83169fd53d71985b5d5b92a3332f50624)

Conflicts:

	htdocs/blocktype/wall/theme/default/inlineposts.tpl

htdocs/blocktype/wall/theme/default/inlineposts.tpl

@@ -5,17 +5,17 @@
     {if $wallposts}
         {foreach from=$wallposts item=wallpost}
             <div class="wallpost{if $wallpost->private} private{/if}">
-                <div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&maxwidth=25&maxheight=25&id={$wallpost->from}" alt="Profile Icon">
+                <div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=25&amp;maxheight=25&amp;id={$wallpost->from}" alt="Profile Icon">
                 <div><a href="{$WWWROOT}user/view.php?id={$wallpost->userid|escape}">{$wallpost->displayname|escape}</a>
                 <span class="postedon"> - {$wallpost->postdate|format_date}</span>
                 </div></div>
                 <div class="text">{$wallpost->text|parse_bbcode}</div>
                 {*<div class="controls">
         {if $ownwall}
-                    [ <a href="{$WWWROOT}blocktype/wall/wall.php?instance={$instanceid}&replyto={$wallpost->id}">{str tag='reply' section='blocktype.wall'}</a> ]
+                    [ <a href="{$WWWROOT}blocktype/wall/wall.php?instance={$instanceid}&amp;replyto={$wallpost->id}">{str tag='reply' section='blocktype.wall'}</a> ]
         {/if}
         {if $ownwall || $wallpost->from == $userid}
-                    [ <a href="{$WWWROOT}blocktype/wall/deletepost.php?instance={$instanceid}&return={if $wholewall}wall{else}profile{/if}">
+                    [ <a href="{$WWWROOT}blocktype/wall/deletepost.php?instance={$instanceid}&amp;return={if $wholewall}wall{else}profile{/if}">
                         {str tag='delete' section='blocktype.wall'}
                     </a> ]
         {/if}