aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-10-17 02:03:14 +0000
committerrvelices <rv-github@modusoptimus.com>2006-10-17 02:03:14 +0000
commit939cfe5e4bc2cb4a3229d1b3f08f6f86b8f348d1 (patch)
tree8646efbcff768888fbb78397b271e93554cec66f
parent6a3aed205772d73fc5cc60bc8877592fd17ba920 (diff)
comments.php: cleanup url (t=1 in the url for an unknown reason) and image
urls work now with all url styles git-svn-id: http://piwigo.org/svn/trunk@1563 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--comments.php7
-rw-r--r--include/functions_html.inc.php3
2 files changed, 6 insertions, 4 deletions
diff --git a/comments.php b/comments.php
index e88ce04fb..28f4bf410 100644
--- a/comments.php
+++ b/comments.php
@@ -158,7 +158,7 @@ DELETE FROM '.COMMENTS_TABLE.'
pwg_query($query);
}
// comments validation
-if (isset($_POST['validate']) and count($_POST['comment_id']) > 0
+if (isset($_POST['validate']) and count($_POST['comment_id']) > 0
and is_admin())
{
$_POST['comment_id'] = array_map('intval', $_POST['comment_id']);
@@ -308,7 +308,7 @@ $query.= '
;';
list($counter) = mysql_fetch_row(pwg_query($query));
-$url = PHPWG_ROOT_PATH.'comments.php?t=1'.get_query_string_diff(array('start'));
+$url = PHPWG_ROOT_PATH.'comments.php'.get_query_string_diff(array('start'));
$navbar = create_navigation_bar($url,
$counter,
@@ -382,7 +382,7 @@ SELECT id, name, file, path, tn_ext
// retrieving category informations
$categories = array();
$query = '
-SELECT id, uppercats
+SELECT id, name, uppercats
FROM '.CATEGORIES_TABLE.'
WHERE id IN ('.implode(',', $category_ids).')
;';
@@ -417,6 +417,7 @@ SELECT id, uppercats
$url = make_picture_url(
array(
'category' => $comment['category_id'],
+ 'cat_name' => $categories[ $comment['category_id']] ['name'],
'image_id' => $comment['image_id'],
'image_file' => $elements[$comment['image_id']]['file'],
)
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 993c46dea..193127195 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -82,7 +82,8 @@ function create_navigation_bar(
global $lang, $conf;
$pages_around = $conf['paginate_pages_around'];
- $start_str = $clean_url ? '/start-' : '&amp;start=';
+ $start_str = $clean_url ? '/start-' :
+ ( ( strstr($url, '?')===false ? '?':'&amp;') . 'start=' );
$navbar = '';