|
@@ -2380,8 +2380,8 @@ class AttributeText extends AttributeString
|
|
{
|
|
{
|
|
foreach($aAllMatches as $iPos => $aMatches)
|
|
foreach($aAllMatches as $iPos => $aMatches)
|
|
{
|
|
{
|
|
- $sClass = $aMatches[1];
|
|
|
|
- $sName = $aMatches[2];
|
|
|
|
|
|
+ $sClass = trim($aMatches[1]);
|
|
|
|
+ $sName = trim($aMatches[2]);
|
|
|
|
|
|
if (MetaModel::IsValidClass($sClass))
|
|
if (MetaModel::IsValidClass($sClass))
|
|
{
|
|
{
|
|
@@ -3842,7 +3842,7 @@ EOF
|
|
$sFormat = static::GetFormat();
|
|
$sFormat = static::GetFormat();
|
|
$aMappings = static::GetFormatMapping();
|
|
$aMappings = static::GetFormatMapping();
|
|
$sSpecialChars = '.?*$^()[]/'; // Characters having a special meaning in a regular expression, must be escaped by prepending a backslash
|
|
$sSpecialChars = '.?*$^()[]/'; // Characters having a special meaning in a regular expression, must be escaped by prepending a backslash
|
|
- $sResult = '^';
|
|
|
|
|
|
+ $sResult = '^';
|
|
|
|
|
|
$bEscaping = false;
|
|
$bEscaping = false;
|
|
for($i=0; $i < strlen($sFormat); $i++)
|
|
for($i=0; $i < strlen($sFormat); $i++)
|