mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-11 03:03:01 +02:00
Merge of the 1.3.1 release
Creation of an unique include file (common.php) Creation of an unique define file (include/constants.php) Modification of the installation procedure git-svn-id: http://piwigo.org/svn/trunk@345 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
+6
-5
@@ -253,9 +253,8 @@ function get_displayed_dirs( $dir, $indent )
|
||||
}
|
||||
$vtp->closeSession( $sub, 'dir' );
|
||||
// recursive call
|
||||
$dirs.= get_displayed_dirs( $dir.'/'.$sub_dir,
|
||||
$indent+30 );
|
||||
|
||||
get_displayed_dirs( $dir.'/'.$sub_dir,
|
||||
$indent+30 );
|
||||
}
|
||||
}
|
||||
//----------------------------------------------------- template initialization
|
||||
@@ -359,7 +358,7 @@ if ( isset( $_GET['dir'] ) )
|
||||
$url = './admin.php?page=thumbnail&dir='.$_GET['dir'];
|
||||
$vtp->setVar( $sub, 'params.action', add_session_id( $url ) );
|
||||
// GD version selected...
|
||||
if ( $_POST['gd'] == 1 )
|
||||
if ( isset( $_POST['gd'] ) and $_POST['gd'] == 1 )
|
||||
{
|
||||
$vtp->setVar( $sub, 'params.gd1_checked', ' checked="checked"' );
|
||||
}
|
||||
@@ -387,10 +386,12 @@ if ( isset( $_GET['dir'] ) )
|
||||
}
|
||||
// options for the number of picture to miniaturize : "n"
|
||||
$options = array( 5,10,20,40 );
|
||||
if ( isset( $_POST['n'] ) ) $n = $_POST['n'];
|
||||
else $n = 5;
|
||||
foreach ( $options as $option ) {
|
||||
$vtp->addSession( $sub, 'n_option' );
|
||||
$vtp->setVar( $sub, 'n_option.option', $option );
|
||||
if ( $option == $_POST['n'] )
|
||||
if ( $option == $n )
|
||||
{
|
||||
$vtp->setVar( $sub, 'n_option.selected', ' selected="selected"' );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user