diff options
| author | patdenice <patdenice@piwigo.org> | 2009-03-12 13:19:22 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-03-12 13:19:22 +0000 |
| commit | b70496545c8b5af966cc1fb99d35dda92f8f3a81 (patch) | |
| tree | ec1de592543153d7dfc2970fe1e137f35c25ead5 /include | |
| parent | 77d508c6d49c70f3a67672327f3d3c40f7de4cbb (diff) | |
merge part of r3190 from trunk to branch 2.0.
URL parameter for template extensions can be used in slideshow.
git-svn-id: http://piwigo.org/svn/branches/2.0@3191 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/template.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php index 386f3123a..14ef8653b 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -199,7 +199,7 @@ class Template { return false; } - if ((stripos(implode('/',array_flip($_GET)), $param) > 0 or $param == 'N/A') + if ((stripos(implode('/',array_keys($_GET)), $param) > 0 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)) |