Support dash in tag name
This commit is contained in:
@@ -223,7 +223,7 @@ class Mask extends PhpObject
|
|||||||
|
|
||||||
private function setDefaultTagValues() {
|
private function setDefaultTagValues() {
|
||||||
$asTagNames = $this->getTags();
|
$asTagNames = $this->getTags();
|
||||||
|
|
||||||
//Default translations
|
//Default translations
|
||||||
foreach($asTagNames as $sTagName) {
|
foreach($asTagNames as $sTagName) {
|
||||||
if(self::isLangTag($sTagName)) $this->setTag($sTagName, $sTagName);
|
if(self::isLangTag($sTagName)) $this->setTag($sTagName, $sTagName);
|
||||||
@@ -235,7 +235,7 @@ class Mask extends PhpObject
|
|||||||
$asMatches = array('tag'=>array());
|
$asMatches = array('tag'=>array());
|
||||||
$sSafeTagMark = preg_quote(self::TAG_MARK);
|
$sSafeTagMark = preg_quote(self::TAG_MARK);
|
||||||
$sSafeLangMark = preg_quote(self::LANG_PREFIX);
|
$sSafeLangMark = preg_quote(self::LANG_PREFIX);
|
||||||
$sPattern = '/'.$sSafeTagMark.'(?P<tag>('.$sSafeLangMark.'|)\w+)'.$sSafeTagMark.'/u';
|
$sPattern = '/'.$sSafeTagMark.'(?P<tag>('.$sSafeLangMark.'|)[\w\-]+)'.$sSafeTagMark.'/u';
|
||||||
preg_match_all($sPattern, $this->sMask, $asMatches);
|
preg_match_all($sPattern, $this->sMask, $asMatches);
|
||||||
return array_unique(array_filter($asMatches['tag']));
|
return array_unique(array_filter($asMatches['tag']));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user