diff options
| author | patdenice <patdenice@piwigo.org> | 2009-03-16 17:53:20 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-03-16 17:53:20 +0000 |
| commit | 00ce8c1bab749c22ab0c355bdc54d9378d4b6732 (patch) | |
| tree | e1bf92306de753767c297dd20bd6db8209f9aff8 | |
| parent | a45e1f526e5cac6d15e76bb1e9bf8ec16ddec08c (diff) | |
merge r3207 from trunk to branch 2.0.
Add "tags" parameter for template extensions
git-svn-id: http://piwigo.org/svn/branches/2.0@3208 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/extend_for_templates.php | 4 | ||||
| -rw-r--r-- | include/template.class.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php index 38c2723fc..b8eefc817 100644 --- a/admin/extend_for_templates.php +++ b/admin/extend_for_templates.php @@ -60,7 +60,9 @@ $relevant_parameters = array( 'posted-monthly-calendar', 'search', 'flat', - 'list',); /* <=> Random */ + 'list', /* <=> Random */ + 'tags', + ); $query = ' SELECT permalink FROM '.CATEGORIES_TABLE.' diff --git a/include/template.class.php b/include/template.class.php index 14ef8653b..be9aeda97 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -199,7 +199,7 @@ class Template { return false; } - if ((stripos(implode('/',array_keys($_GET)), $param) > 0 or $param == 'N/A') + if ((stripos(implode('',array_keys($_GET)), '/'.$param) !== false or $param == 'N/A') and (preg_match('/'.preg_quote($tpl,'/').'$/', $this->get_template_dir()) or $tpl == 'N/A') and (!isset($this->extents[$handle]) or $overwrite) and file_exists($dir . $filename)) |