aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions_url.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-04-13 23:58:28 +0000
committerrvelices <rv-github@modusoptimus.com>2007-04-13 23:58:28 +0000
commitf386460ec31490ced9d169afe500dfb00ae3aed8 (patch)
treedfbd2049af849520bd250cb2c399c2571470de6f /include/functions_url.inc.php
parent38ca856ea4adf9daf7cdb91e580a70ab176eb6f4 (diff)
merge r1955 from branch-1_7 to trunk:
flat view small improvements (picture page on root category sorter urls and works in several cases) correction in permalinks admin (error was assignment in if instead of comparison) git-svn-id: http://piwigo.org/svn/trunk@1956 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_url.inc.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 04e0b32d1..31696096f 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -246,6 +246,10 @@ function make_picture_url($params)
default:
$url .= $params['image_id'];
}
+ if ( !isset($params['category'] ) )
+ {// make urls shorter ...
+ unset( $params['flat'] );
+ }
$url .= make_section_in_url($params);
$url = add_well_known_params_in_url($url, $params);
return $url;