Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

 interface/web/help/form/support_message.tform.php

@@ -46,7 +46,7 @@
if(isset($_GET['reply']))
{
   $sm_msg_id = preg_replace("/[^0-9]/", "", $_GET['reply']);
   $res = $app->db->queryOneRecord("SELECT sender_id, subject FROM support_message WHERE support_message_id=$sm_msg_id");
   $res = $app->db->queryOneRecord("SELECT sender_id, subject FROM support_message WHERE support_message_id=?", $sm_msg_id);
   if($res['sender_id'])
   {
      $sm_default_recipient_id = $res['sender_id'];