mirror of
https://github.com/friendica/friendica
synced 2025-04-27 16:30:10 +00:00
reverting tinymce changes, updating smarty to 3.1.19
This commit is contained in:
parent
5633e88aad
commit
0e1f8f6486
155 changed files with 13663 additions and 10784 deletions
|
@ -2,21 +2,20 @@
|
|||
/**
|
||||
* Smarty Resource Plugin
|
||||
*
|
||||
* @package Smarty
|
||||
* @package Smarty
|
||||
* @subpackage TemplateResources
|
||||
* @author Rodney Rehm
|
||||
* @author Rodney Rehm
|
||||
*/
|
||||
|
||||
/**
|
||||
* Smarty Resource Plugin
|
||||
*
|
||||
* Wrapper Implementation for custom resource plugins
|
||||
*
|
||||
* @package Smarty
|
||||
* @package Smarty
|
||||
* @subpackage TemplateResources
|
||||
*/
|
||||
abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
||||
|
||||
abstract class Smarty_Resource_Custom extends Smarty_Resource
|
||||
{
|
||||
/**
|
||||
* fetch template and its modification time from data source
|
||||
*
|
||||
|
@ -24,15 +23,15 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
|||
* @param string &$source template source
|
||||
* @param integer &$mtime template modification timestamp (epoch)
|
||||
*/
|
||||
protected abstract function fetch($name, &$source, &$mtime);
|
||||
abstract protected function fetch($name, &$source, &$mtime);
|
||||
|
||||
/**
|
||||
* Fetch template's modification timestamp from data source
|
||||
*
|
||||
* {@internal implementing this method is optional.
|
||||
* Only implement it if modification times can be accessed faster than loading the complete template source.}}
|
||||
*
|
||||
* @param string $name template name
|
||||
* @param string $name template name
|
||||
*
|
||||
* @return integer|boolean timestamp (epoch) the template was modified, or false if not found
|
||||
*/
|
||||
protected function fetchTimestamp($name)
|
||||
|
@ -46,9 +45,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
|||
* @param Smarty_Template_Source $source source object
|
||||
* @param Smarty_Internal_Template $_template template object
|
||||
*/
|
||||
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
|
||||
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
|
||||
{
|
||||
$source->filepath = strtolower($source->type . ':' . $source->name);
|
||||
$source->filepath = $source->type . ':' . $source->name;
|
||||
$source->uid = sha1($source->type . ':' . $source->name);
|
||||
|
||||
$mtime = $this->fetchTimestamp($source->name);
|
||||
|
@ -57,8 +56,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
|||
} else {
|
||||
$this->fetch($source->name, $content, $timestamp);
|
||||
$source->timestamp = isset($timestamp) ? $timestamp : false;
|
||||
if( isset($content) )
|
||||
if (isset($content)) {
|
||||
$source->content = $content;
|
||||
}
|
||||
}
|
||||
$source->exists = !!$source->timestamp;
|
||||
}
|
||||
|
@ -66,9 +66,10 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
|||
/**
|
||||
* Load template's source into current template object
|
||||
*
|
||||
* @param Smarty_Template_Source $source source object
|
||||
* @return string template source
|
||||
* @throws SmartyException if source cannot be loaded
|
||||
* @param Smarty_Template_Source $source source object
|
||||
*
|
||||
* @return string template source
|
||||
* @throws SmartyException if source cannot be loaded
|
||||
*/
|
||||
public function getContent(Smarty_Template_Source $source)
|
||||
{
|
||||
|
@ -83,14 +84,12 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource {
|
|||
/**
|
||||
* Determine basename for compiled filename
|
||||
*
|
||||
* @param Smarty_Template_Source $source source object
|
||||
* @return string resource's basename
|
||||
* @param Smarty_Template_Source $source source object
|
||||
*
|
||||
* @return string resource's basename
|
||||
*/
|
||||
protected function getBasename(Smarty_Template_Source $source)
|
||||
{
|
||||
return basename($source->name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
Loading…
Add table
Add a link
Reference in a new issue