adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 08:33:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r6414 from branch 2.1

Browse Source 
favorite image icon is not taken from php but left to the theme

git-svn-id: http://piwigo.org/svn/trunk@6615 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-06-28 19:45:21 +00:00
parent 3b946ffd16
commit 7125711f59
4 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
picture.php
+24 -44
View File
@@ -312,13 +312,13 @@ UPDATE '.CATEGORIES_TABLE.'
case 'edit_comment' :
{
check_pwg_token();
include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
check_input_parameter('comment_to_edit', $_GET, false, PATTERN_ID);
$author_id = get_comment_author_id($_GET['comment_to_edit']);
if (can_manage_comment('edit', $author_id))
{
if (!empty($_POST['content']))
@@ -331,7 +331,7 @@ UPDATE '.CATEGORIES_TABLE.'
),
$_POST['key']
);
redirect($url_self);
}
else
@@ -344,35 +344,35 @@ UPDATE '.CATEGORIES_TABLE.'
case 'delete_comment' :
{
check_pwg_token();
include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
check_input_parameter('comment_to_delete', $_GET, false, PATTERN_ID);
$author_id = get_comment_author_id($_GET['comment_to_delete']);
if (can_manage_comment('delete', $author_id))
{
delete_user_comment($_GET['comment_to_delete']);
}
redirect($url_self);
}
case 'validate_comment' :
{
check_pwg_token();
include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
check_input_parameter('comment_to_validate', $_GET, false, PATTERN_ID);
$author_id = get_comment_author_id($_GET['comment_to_validate']);
if (can_manage_comment('validate', $author_id))
{
validate_user_comment($_GET['comment_to_validate']);
}
redirect($url_self);
}
@@ -796,39 +796,19 @@ SELECT COUNT(*) AS nb_fav
WHERE image_id = '.$page['image_id'].'
AND user_id = '.$user['id'].'
;';
$result = pwg_query($query);
$row = pwg_db_fetch_assoc($result);
$row = pwg_db_fetch_assoc( pwg_query($query) );
$is_favorite = $row['nb_fav'] != 0;
if ($row['nb_fav'] == 0)
{
$template->assign(
'favorite',
array(
'FAVORITE_IMG' =>
get_root_url().get_themeconf('icon_dir').'/favorite.png',
'FAVORITE_HINT' => l10n('add this image to your favorites'),
'U_FAVORITE' => add_url_params(
$url_self,
array('action'=>'add_to_favorites')
),
)
);
}
else
{
$template->assign(
'favorite',
array(
'FAVORITE_IMG' =>
get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
'FAVORITE_HINT' => l10n('delete this image from your favorites'),
'U_FAVORITE' => add_url_params(
$url_self,
array('action'=>'remove_from_favorites')
),
)
);
}
$template->assign(
'favorite',
array(
'IS_FAVORITE' => $is_favorite,
'U_FAVORITE' => add_url_params(
$url_self,
array('action'=> !$is_favorite ? 'add_to_favorites' : 'remove_from_favorites' )
),
)
);
}
//--------------------------------------------------------- picture information
@@ -1017,4 +997,4 @@ else
//------------------------------------------------------------ log informations
pwg_log($picture['current']['id'], 'picture');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>
?>