php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

smarty 3.1.8 releases - see changelog

Browse Source
This commit is contained in:
Ian
2012-02-20 18:06:30 +01:00
parent 83ccfc55db
commit 6d6b286420
22 changed files with 285 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundled-libs/Smarty/libs/Smarty.class.php
+12 -4
View File
@@ -2,7 +2,7 @@
/**
* Project: Smarty: the PHP compiling template engine
* File: Smarty.class.php
* SVN: $Id: Smarty.class.php 4518 2011-12-18 18:48:07Z rodneyrehm $
* SVN: $Id: Smarty.class.php 4551 2012-02-06 20:45:10Z rodneyrehm $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
* @author Uwe Tews
* @author Rodney Rehm
* @package Smarty
* @version 3.1.7
* @version 3.1.8
*/
/**
@@ -113,7 +113,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
/**
* smarty version
*/
const SMARTY_VERSION = 'Smarty-3.1.7';
const SMARTY_VERSION = 'Smarty-3.1.8';
/**
* define variable scopes
@@ -1277,6 +1277,8 @@ class Smarty extends Smarty_Internal_TemplateBase {
}
// plugin filename is expected to be: [type].[name].php
$_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
$_stream_resolve_include_path = function_exists('stream_resolve_include_path');
// loop through plugin dirs and find the plugin
foreach($this->getPluginsDir() as $_plugin_dir) {
@@ -1291,7 +1293,13 @@ class Smarty extends Smarty_Internal_TemplateBase {
}
if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
// try PHP include_path
if (($file = Smarty_Internal_Get_Include_Path::getIncludePath($file)) !== false) {
if ($_stream_resolve_include_path) {
$file = stream_resolve_include_path($file);
} else {
$file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
}
if ($file !== false) {
require_once($file);
return $file;
}