mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #327 from oldrind/template

Browse Source 
修复标签属性不支持-的问题
This commit is contained in:
ThinkPHP
2016-02-29 09:53:37 +08:00
parent 4931fb2c24 884e036a46
commit e7ed4be654
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Template.php
View File

@@ -645,7 +645,7 @@ class Template
*/
public function parseAttr($str, $name = null)
{
$regex = '/\s+(?>(?<name>\w+)\s*)=(?>\s*)([\"\'])(?<value>(?:(?!\\2).)*)\\2/is';
$regex = '/\s+(?>(?<name>[\w-]+)\s*)=(?>\s*)([\"\'])(?<value>(?:(?!\\2).)*)\\2/is';
$array = [];
if (preg_match_all($regex, $str, $matches, PREG_SET_ORDER)) {
foreach ($matches as $match) {

2
tests/thinkphp/library/think/templateTest.php
View File

@@ -257,7 +257,7 @@ EOF;
$_GET['action'] = 'action';
$_POST['action'] = 'action';
$_COOKIE['name'] = 'name';
\think\Session::set('action', ['name' => 'name']);
$_SESSION['action'] = ['name' => 'name'];
define('SITE_NAME', 'site_name');
$content = <<<EOF