iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

- bug 111 fixed: "Can't add virtual category when cookie

Browse Source 
disabled". Correction reported from branch 1.4.

- bug 109 fixed : "disabled "best rated" menu item when rating is not
  enabled". Correction reported from branch 1.4.

- bug 95 fixed : "default maxwidth and maxheight not registered". Correction
  reported from branch 1.4.


git-svn-id: http://piwigo.org/svn/trunk@869 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-09-18 22:29:17 +00:00
parent b1c5e25b5e
commit 541c302c40
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/cat_list.php
View File

@@ -238,7 +238,7 @@ else
$template->assign_vars(array(
'CATEGORIES_NAV'=>$navigation,
'NEXT_RANK'=>$next_rank,
'F_ACTION'=>$form_action,
'F_ACTION'=>add_session_id($form_action),
'L_ADD_VIRTUAL'=>$lang['cat_add'],
'L_SUBMIT'=>$lang['submit'],

20
admin/configuration.php
View File

@@ -82,6 +82,22 @@ if (isset($_POST['submit']))
{
array_push($page['errors'], $lang['periods_error']);
}
// maxwidth
if (isset($_POST['default_maxwidth'])
and !empty($_POST['default_maxwidth'])
and (!preg_match($int_pattern, $_POST['default_maxwidth'])
or $_POST['default_maxwidth'] < 50))
{
array_push($page['errors'], $lang['maxwidth_error']);
}
// maxheight
if (isset($_POST['default_maxheight'])
and !empty($_POST['default_maxheight'])
and (!preg_match($int_pattern, $_POST['default_maxheight'])
or $_POST['default_maxheight'] < 50))
{
array_push($page['errors'], $lang['maxheight_error']);
}
break;
}
}
@@ -89,7 +105,7 @@ if (isset($_POST['submit']))
// updating configuration if no error found
if (count($page['errors']) == 0)
{
echo '<pre>'; print_r($_POST); echo '</pre>';
// echo '<pre>'; print_r($_POST); echo '</pre>';
$result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
while ($row = mysql_fetch_array($result))
{
@@ -176,6 +192,8 @@ switch ($page['section'])
'NB_ROW_PAGE'=>$conf['nb_line_page'],
'CONF_RECENT'=>$conf['recent_period'],
'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
'MAXWIDTH'=>$conf['default_maxwidth'],
'MAXHEIGHT'=>$conf['default_maxheight'],
'EXPAND_YES'=>$expand_yes,
'EXPAND_NO'=>$expand_no,
'SHOW_COMMENTS_YES'=>$show_yes,

18
category.php
View File

@@ -214,13 +214,17 @@ $template->assign_block_vars(
'NAME' => $lang['most_visited_cat']
));
// best rated
$template->assign_block_vars(
'special_cat',
array(
'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'),
'TITLE' => $lang['best_rated_cat_hint'],
'NAME' => $lang['best_rated_cat']
));
if ($conf['rate'])
{
$template->assign_block_vars(
'special_cat',
array(
'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'),
'TITLE' => $lang['best_rated_cat_hint'],
'NAME' => $lang['best_rated_cat']
)
);
}
// random
$template->assign_block_vars(
'special_cat',

11
doc/ChangeLog
View File

@@ -1,3 +1,14 @@
2005-09-18 Pierrick LE GALL
* bug 111 fixed: "Can't add virtual category when cookie
disabled". Correction reported from branch 1.4.
* bug 109 fixed : "disabled "best rated" menu item when rating is
not enabled". Correction reported from branch 1.4.
* bug 95 fixed : "default maxwidth and maxheight not registered
". Correction reported from branch 1.4.
2005-09-18 Pierrick LE GALL
* bug 107 fixed: crash when logging visit on a category containing