Merge branch 'patch-2' into 'stable-3.1'

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

 interface/web/sites/shell_user_list.php

@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

/******************************************
* Begin Form configuration
@@ -49,8 +49,8 @@
// Limit the results to alias domains
//$app->listform_actions->SQLExtWhere = "type = 'subdomain'";

$app->listform_actions->SQLOrderBy = 'ORDER BY username';
$app->listform_actions->SQLOrderBy = 'ORDER BY shell_user.username';
$app->listform_actions->onLoad();


?>
?>