Commit f675fbf6 authored by kiz_0987's avatar kiz_0987

Fix for breadcrumb and user album links for non-URL rewrite cases.

Added '?>' to end of g2image config.php file.
parent a43b9fdf
......@@ -233,7 +233,8 @@ function gallery_page() {
$link = $urlGenerator->generateUrl(
array('view' => 'core.ShowItem',
'itemId' => $parent['id']),
array('forceFullUrl' => 1));
array('forceFullUrl' => 1,
'htmlEntities' => false));
$breadcrumb[] = l($parent_title, $link);
}
}
......
......@@ -1053,6 +1053,7 @@ function _gallery_g2image_settings_form_validate(&$form_values) {
$content .= '$g2ic_default_action = \'' . $form_values['gallery_g2image_default_action'] . '\';' . $cr;
$content .= '$g2ic_sortby = \'' . $form_values['gallery_g2image_sortby'] . '\';' . $cr;
$content .= '$g2ic_custom_url = \'' . $form_values['gallery_g2image_custom_url'] . '\';' . $cr;
$content .= '?>' . $cr;
$filename = $path . '/config.php';
if (is_writable($filename) == false) {
......@@ -1076,4 +1077,4 @@ function _gallery_g2image_settings_form_validate(&$form_values) {
fclose($handle);
return array($num_errors, $num_warnings, $results['gallery_g2image']);
}
?>
\ No newline at end of file
?>
......@@ -267,7 +267,8 @@ function gallery_view_user($user) {
$link = $urlGenerator->generateUrl(
array('view' => 'core.ShowItem',
'itemId' => $albumId),
array('forceFullUrl' => 1));
array('forceFullUrl' => 1,
'htmlEntities' => false));
$form['gallery_view_user_album'] = array(
'value' => l(t('User Album'), $link),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment