aboutsummaryrefslogtreecommitdiffstats
path: root/include/picture_comment.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-03-16 22:34:45 +0000
committerplegall <plg@piwigo.org>2006-03-16 22:34:45 +0000
commit5980db248ab4cc05e8596e07d7efc31048bcb8e8 (patch)
tree8cd6f048c590c0439b93e8a62f72c6300ff323c0 /include/picture_comment.inc.php
parent853bf2a0a5bc77d6ad1d22dbe778eb6b7b1b12be (diff)
bug fixed: create_navigation_bar take into account clean URL if requested.
deletion: argument link_class (HTML class of links) in function create_navigation_bar was removed, useless since branch 1.5. bug fixed: rate_items are now a configuration parameter (set in config file) modification: new functions library functions_rate.inc.php to reduce picture.php length. bug fixed: categories were never expanded in the menu since clean URLs. bug fixed: changing pictures sorting order in main page was always rederecting to root category. git-svn-id: http://piwigo.org/svn/trunk@1084 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/picture_comment.inc.php26
1 files changed, 8 insertions, 18 deletions
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index 79373d2f7..6a40ea442 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -129,30 +129,17 @@ if ($page['show_comments'])
$row = mysql_fetch_array( pwg_query( $query ) );
// navigation bar creation
- $url = PHPWG_ROOT_PATH.'picture.php';
- $url.= get_query_string_diff(array('add_fav','start'));
-
-// $url = duplicate_picture_URL(
-// array(),
-// array('start')
-// );
-
- if (!isset($_GET['start'])
- or !is_numeric($_GET['start'])
- or (is_numeric($_GET['start']) and $_GET['start'] < 0))
+ if (!isset($page['start']))
{
$page['start'] = 0;
}
- else
- {
- $page['start'] = $_GET['start'];
- }
+
$page['navigation_bar'] = create_navigation_bar(
- $url,
+ duplicate_picture_URL(array(), array('start')),
$row['nb_comments'],
$page['start'],
$conf['nb_comment_page'],
- ''
+ true // We want a clean URL
);
$template->assign_block_vars(
@@ -198,7 +185,10 @@ SELECT id,author,date,image_id,content
$template->assign_block_vars(
'comments.comment.delete',
array(
- 'U_COMMENT_DELETE' => $url.'&amp;del='.$row['id']
+ 'U_COMMENT_DELETE' =>
+ $url_self
+ .'&amp;action=delete_comment'
+ .'&amp;comment_to_delete='.$row['id']
)
);
}