Browse Source

N.780 Friendly name format ignored if only one attribute is used

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4630 a333f486-631f-4898-b8df-5754b55c2be0
romainq 8 years ago
parent
commit
ed12a47840
1 changed files with 2 additions and 7 deletions
  1. 2 7
      setup/compiler.class.inc.php

+ 2 - 7
setup/compiler.class.inc.php

@@ -1,5 +1,5 @@
 <?php
 <?php
-// Copyright (C) 2011-2016 Combodo SARL
+// Copyright (C) 2011-2017 Combodo SARL
 //
 //
 //   This file is part of iTop.
 //   This file is part of iTop.
 //
 //
@@ -889,16 +889,11 @@ EOF
 			{
 			{
 				$aNameAttCodes[] = $oAttribute->getAttribute('id');
 				$aNameAttCodes[] = $oAttribute->getAttribute('id');
 			}
 			}
-			if (count($aNameAttCodes) > 1)
+			if (count($aNameAttCodes) > 0)
 			{
 			{
 				// New style...
 				// New style...
 				$sNameAttCode = "array('".implode("', '", $aNameAttCodes)."')";
 				$sNameAttCode = "array('".implode("', '", $aNameAttCodes)."')";
 			}
 			}
-			elseif (count($aNameAttCodes) == 1)
-			{
-				// New style...
-				$sNameAttCode = "'$aNameAttCodes[0]'";
-			}
 			else
 			else
 			{
 			{
 				$sNameAttCode = "''";
 				$sNameAttCode = "''";