Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 8a77a74e1a7a31196541691fce711bdcebaa1d2e

 interface/web/client/client_circle_list.php

@@ -1,6 +1,6 @@
<?php
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
@@ -17,8 +17,8 @@

$app->uses('listform_actions');

$app->listform_actions->SQLOrderBy = 'ORDER BY circle_name, circle_id';
$app->listform_actions->SQLOrderBy = 'ORDER BY client_circle.circle_name, client_circle.circle_id';
$app->listform_actions->onLoad();


?>
?>