mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-03 05:48:11 +08:00
merge from yiisoft/yii2
This commit is contained in:
@ -822,7 +822,7 @@ class ReleaseController extends Controller
|
||||
$v = str_replace('\\-', '[\\- ]', preg_quote($version, '/'));
|
||||
$headline = $version . ' ' . date('F d, Y');
|
||||
$this->sed(
|
||||
'/' . $v . ' under development\n(-+?)\n/',
|
||||
'/' . $v . ' under development\R(-+?)\R/',
|
||||
$headline . "\n" . str_repeat('-', \strlen($headline)) . "\n",
|
||||
$this->getChangelogs($what)
|
||||
);
|
||||
@ -987,7 +987,7 @@ class ReleaseController extends Controller
|
||||
protected function updateYiiVersion($frameworkPath, $version)
|
||||
{
|
||||
$this->sed(
|
||||
'/function getVersion\(\)\n \{\n return \'(.+?)\';/',
|
||||
'/function getVersion\(\)\R \{\R return \'(.+?)\';/',
|
||||
"function getVersion()\n {\n return '$version';",
|
||||
$frameworkPath . '/BaseYii.php');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user