diff options
author | plegall <plg@piwigo.org> | 2016-02-01 10:20:57 +0100 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2016-02-01 10:20:57 +0100 |
commit | da8d2b2af0e38715a929b3d4b900ee793cdfb3e8 (patch) | |
tree | 386658eb909674adbb0c2afbe756bdbf9a895d37 /include/calendar_base.class.php | |
parent | 70726892e031553563899783d9caab4d2c2e5b65 (diff) | |
parent | 2fcf276811723d300b4d4c08675994339a6688fa (diff) |
Merge branch 'master' into translation
Diffstat (limited to 'include/calendar_base.class.php')
-rw-r--r-- | include/calendar_base.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/calendar_base.class.php b/include/calendar_base.class.php index f48fae1e3..020265d17 100644 --- a/include/calendar_base.class.php +++ b/include/calendar_base.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2016 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -360,7 +360,7 @@ GROUP BY period'; if ( !empty($tpl_var) ) { $existing = $template->smarty->getVariable('chronology_navigation_bars'); - if (! ($existing instanceof Undefined_Smarty_Variable)) + if (! ($existing instanceof Smarty_Undefined_Variable)) { $existing->value[ sizeof($existing->value)-1 ] = array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var); |