diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/category_calendar.inc.php | 2 | ||||
| -rw-r--r-- | include/config.inc.php | 4 | ||||
| -rw-r--r-- | include/constants.php | 2 | ||||
| -rw-r--r-- | include/functions.inc.php | 8 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 2 | ||||
| -rw-r--r-- | include/page_tail.php | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php index fd6c11861..2f57edaab 100644 --- a/include/category_calendar.inc.php +++ b/include/category_calendar.inc.php @@ -406,7 +406,7 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path $url_link.= '&search='.$conf['calendar_datefield'].':'.$_GET['day']; if ($calendar_category != 0) { - $url_link.= ';cat:'.$calendar_category.'|AND'; + $url_link.= '--cat:'.$calendar_category.'|AND'; } $template->assign_block_vars( diff --git a/include/config.inc.php b/include/config.inc.php index c9c23b0e5..b13f1d6c7 100644 --- a/include/config.inc.php +++ b/include/config.inc.php @@ -191,4 +191,8 @@ $conf['tn_width'] = 128; // tn_height : default height for thumbnails creation $conf['tn_height'] = 96; + +// show_version : shall the version of PhpWebGallery be displayed at the +// bottom of each page ? +$conf['show_version'] = false; ?> diff --git a/include/constants.php b/include/constants.php index 944bacca6..65a1dd91c 100644 --- a/include/constants.php +++ b/include/constants.php @@ -26,7 +26,7 @@ // +-----------------------------------------------------------------------+ // Default settings -define('PHPWG_VERSION', '1.4.0RC3'); +define('PHPWG_VERSION', '1.4.1'); define('PHPWG_URL', 'http://www.phpwebgallery.net'); define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net'); diff --git a/include/functions.inc.php b/include/functions.inc.php index edc9f2062..80399ce87 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -340,11 +340,11 @@ INSERT INTO '.HISTORY_TABLE.' (date,login,IP,file,category,picture) VALUES (NOW(), - \''.(($user['id'] == 2) ? 'guest' : $user['username']).'\', + \''.(($user['id'] == 2) ? 'guest' : addslashes($user['username'])).'\', \''.$_SERVER['REMOTE_ADDR'].'\', - \''.$file.'\', - \''.$category.'\', - \''.$picture.'\') + \''.addslashes($file).'\', + \''.addslashes($category).'\', + \''.addslashes($picture).'\') ;'; pwg_query($query); } diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 9c4e1ebab..9d946df4f 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -389,7 +389,7 @@ function initialize_category( $calling_page = 'category' ) $search['mode'] = 'OR'; } - $search_tokens = explode(';', $tokens[0]); + $search_tokens = explode('--', $tokens[0]); foreach ($search_tokens as $search_token) { $tokens = explode(':', $search_token); diff --git a/include/page_tail.php b/include/page_tail.php index 910516dcc..5e4a977e6 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -28,7 +28,7 @@ $template->set_filenames(array('tail'=>'footer.tpl')); $template->assign_vars( array( - 'VERSION' => PHPWG_VERSION, + 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'MAIL'=>$conf['mail_webmaster'], 'L_GEN_TIME' => $lang['generation_time'], |