aboutsummaryrefslogtreecommitdiffstats
path: root/picture.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-03-23 01:49:04 +0000
committerrvelices <rv-github@modusoptimus.com>2006-03-23 01:49:04 +0000
commit5c7d65500573ed52ea2fb1aff8a3218b524ea982 (patch)
tree1a658831f2a515a3e4210d7c9c9ff6ddfcad7f1e /picture.php
parent4cb765e78362f36073bd490248b1f870095b5c40 (diff)
URL rewrite: 3 options in the config file define behaviour (question mark
removal, file name for picture and .php extension removal) fix: added unsigned for column in install sql - for the sake of uniformization change: add_url_param is now add_url_params and takes an array as parameter instead of a string git-svn-id: http://piwigo.org/svn/trunk@1094 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--picture.php30
1 files changed, 22 insertions, 8 deletions
diff --git a/picture.php b/picture.php
index 09353aa39..ac1b2efbe 100644
--- a/picture.php
+++ b/picture.php
@@ -357,16 +357,20 @@ $url_admin =
.'&amp;image_id='.$page['image_id']
;
-$url_slide = add_url_param(
+$url_slide = add_url_params(
$picture['current']['url'],
- 'slideshow='.$conf['slideshow_period'] );
+ array( 'slideshow'=>$conf['slideshow_period'] )
+ );
$title = $picture['current']['name'];
$refresh = 0;
if ( isset( $_GET['slideshow'] ) and isset($page['next_item']) )
{
$refresh= $_GET['slideshow'];
- $url_link = add_url_param($picture['next']['url'], 'slideshow='.$refresh);
+ $url_link = add_url_params(
+ $picture['next']['url'],
+ array('slideshow'=>$refresh)
+ );
}
$title_img = $picture['current']['name'];
@@ -410,7 +414,7 @@ if ($conf['show_exif'] or $conf['show_iptc'])
$metadata_showable = true;
if ( !isset($_GET['metadata']) )
{
- $url_metadata = add_url_param( $url_metadata, 'metadata' );
+ $url_metadata = add_url_params( $url_metadata, array('metadata'=>null) );
}
}
else
@@ -526,7 +530,9 @@ if (is_admin() and isset($page['category']))
$template->assign_block_vars(
'representative',
array(
- 'URL' => add_url_param($url_self, 'action=set_as_representative')
+ 'URL' => add_url_params($url_self,
+ array('action'=>'set_as_representative')
+ )
)
);
}
@@ -537,7 +543,9 @@ if (is_admin())
$template->assign_block_vars(
'caddie',
array(
- 'URL' => add_url_param($url_self, 'action=add_to_caddie')
+ 'URL' => add_url_params($url_self,
+ array('action'=>'add_to_caddie')
+ )
)
);
}
@@ -563,7 +571,10 @@ SELECT COUNT(*) AS nb_fav
'FAVORITE_IMG' => get_root_url().get_themeconf('icon_dir').'/favorite.png',
'FAVORITE_HINT' => $lang['add_favorites_hint'],
'FAVORITE_ALT' => $lang['add_favorites_alt'],
- 'U_FAVORITE' => add_url_param($url_self, 'action=add_to_favorites'),
+ 'U_FAVORITE' => add_url_params(
+ $url_self,
+ array('action'=>'add_to_favorites')
+ ),
)
);
}
@@ -575,7 +586,10 @@ SELECT COUNT(*) AS nb_fav
'FAVORITE_IMG' => get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
'FAVORITE_HINT' => $lang['del_favorites_hint'],
'FAVORITE_ALT' => $lang['del_favorites_alt'],
- 'U_FAVORITE' => add_url_param($url_self, 'action=remove_from_favorites'),
+ 'U_FAVORITE' => add_url_params(
+ $url_self,
+ array('action'=>'remove_from_favorites')
+ )
)
);
}