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
This commit is contained in:
patdenice
2009-03-16 17:53:20 +00:00
parent a45e1f526e
commit 00ce8c1bab
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -60,7 +60,9 @@ $relevant_parameters = array(
'posted-monthly-calendar',
'search',
'flat',
'list',); /* <=> Random */
'list', /* <=> Random */
'tags',
);
$query = '
SELECT permalink
FROM '.CATEGORIES_TABLE.'
+1 -1
View File
@@ -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))