summaryrefslogtreecommitdiff
path: root/gallery_lookup_inc.php
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-08-30 22:17:54 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-08-30 22:17:54 +0000
commitbc4cbe335644c7e262e2d49cae24f390d7be0466 (patch)
tree2e2d2c386f6984638016526de0cd28f5c0e98a64 /gallery_lookup_inc.php
parent45f31d03125b5d2b858e57ec02e8c7fca748180c (diff)
downloadfisheye-bc4cbe335644c7e262e2d49cae24f390d7be0466.tar.gz
fisheye-bc4cbe335644c7e262e2d49cae24f390d7be0466.tar.bz2
fisheye-bc4cbe335644c7e262e2d49cae24f390d7be0466.zip
synch recent changes from R1 to HEAD
Diffstat (limited to 'gallery_lookup_inc.php')
-rw-r--r--gallery_lookup_inc.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/gallery_lookup_inc.php b/gallery_lookup_inc.php
index d827623..64c2bde 100644
--- a/gallery_lookup_inc.php
+++ b/gallery_lookup_inc.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_lookup_inc.php,v 1.4 2005/08/24 20:50:17 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_lookup_inc.php,v 1.5 2005/08/30 22:17:54 squareing Exp $
* @package fisheye
* @subpackage functions
*/
@@ -22,11 +22,9 @@ if (!empty($_REQUEST['gallery_id']) && is_numeric($_REQUEST['gallery_id'])) {
if( !empty( $_REQUEST['gallery_path'] ) ) {
$gContent->setGalleryPath( $_REQUEST['gallery_path'] );
-} else {
- if( $parents = $gContent->getParentGalleries() ) {
- $gal = current( $parents );
- $gContent->setGalleryPath( '/'.$gal['gallery_id'] );
- }
+} elseif( $gContent->isValid() && $parents = $gContent->getParentGalleries() ) {
+ $gal = current( $parents );
+ $gContent->setGalleryPath( '/'.$gal['gallery_id'] );
}
$gBitSmarty->assign_by_ref('gContent', $gContent);