Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/help/support_message_list.php

@@ -12,7 +12,7 @@
$app->uses('listform_actions');

//* Optional limit
$app->listform_actions->SQLExtWhere = "recipient_id = ".$_SESSION['s']['user']['userid'];
$app->listform_actions->SQLExtWhere = "support_message.recipient_id = ".$_SESSION['s']['user']['userid'];

//* Start the form rendering and action ahndling
$app->listform_actions->onLoad();