Skip to content

Commit

Permalink
Merge pull request #60 from potherca-contrib/1.3.x
Browse files Browse the repository at this point in the history
Merge was blocked waiting for Scrutinizer. I've tried resolving the issue on their end but did not succeed.

Temporarily disabled the requirement for Scrutinizer to pass so this can be merged.

If this error regarding Scrutinizer occurs again I'll actually investigate further.
  • Loading branch information
Potherca authored Aug 29, 2017
2 parents b833d8f + fb789b7 commit 68d3a01
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion classes/PHPTAL.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* @link http://phptal.org/
*/

define('PHPTAL_VERSION', '1_3_0');
define('PHPTAL_VERSION', '1_3_1');

PHPTAL::autoloadRegister();

Expand Down
3 changes: 2 additions & 1 deletion classes/PHPTAL/Dom/SaxXmlParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,8 @@ private function checkEncoding($str)
*/
private static function convertBytesToEntities(array $m)
{
$m = $m[1]; $out = '';
$m = $m[1];
$out = "";
for($i=0; $i < strlen($m); $i++)
{
$out .= '&#X'.strtoupper(dechex(ord($m[$i]))).';';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "phptal/phptal",
"homepage": "http://phptal.org/",
"description": "PHPTAL is a templating engine for PHP5 that implements Zope Page Templates syntax",
"version":"1.3.0",
"version":"1.3.1",
"license": "LGPL-2.1+",
"type": "library",
"keywords": [
Expand Down

0 comments on commit 68d3a01

Please sign in to comment.