Merge branch 'release/3.1.36'

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.36] - 2020-04-14
+
+### Fixed
+ - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
+
 ## [3.1.35] - 2020-04-14
  - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
  - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506

libs/Smarty.class.php

@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.34-dev-7';
+    const SMARTY_VERSION = '3.1.36';
     /**
      * define variable scopes
      */

make-release.sh

@@ -4,8 +4,9 @@ printf 'Creating release %s\n' "$1"
 
 git checkout -b "release/$1"
 sed -i "s/## \\[Unreleased\\]/## \\[Unreleased\\]\\n\\n## \\[$1\\] - $(date +%Y-%m-%d)/" CHANGELOG.md
+sed -i "s/const SMARTY_VERSION = '[^']\+';/const SMARTY_VERSION = '$1';/" libs/Smarty.class.php
 
-git add CHANGELOG.md
+git add CHANGELOG.md libs/Smarty.class.php
 git commit -m "version bump"
 
 git checkout master