BUGFIX: Take into account tablename with custom columns in get_title_sql (from r97003)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99101 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-02-16 03:09:27 +00:00 committed by Sam Minnee
parent 3c3cb7fd0e
commit 7280144b6a

View File

@ -740,8 +740,14 @@ class Member extends DataObject {
* @return String SQL
*/
static function get_title_sql($tableName = 'Member') {
if (self::$title_format) {
return "CONCAT(".join("'".self::$title_format['sep']."'", self::$title_format['columns']).")";
$columnsWithTablename = array();
foreach(self::$title_format['columns'] as $column) {
$columnsWithTablename[] = "$tableName.$column";
}
return "CONCAT(".join("'".self::$title_format['sep']."'", $columnsWithTablename).")";
} else {
return "CONCAT($tableName.Surname, ' ', $tableName.FirstName)";
}