mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +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:
+4
-4
@@ -36,7 +36,7 @@ function display_pictures( $mysql_result, $maxtime, $validation_box = false )
|
||||
$subresult = mysql_query( $query );
|
||||
$subrow = mysql_fetch_array( $subresult );
|
||||
|
||||
if ( $array_cat_directories[$subrow['cat_id']] == '' )
|
||||
if ( !isset( $array_cat_directories[$subrow['cat_id']] ) )
|
||||
{
|
||||
$array_cat_directories[$subrow['cat_id']] =
|
||||
get_complete_dir( $subrow['cat_id'] );
|
||||
@@ -49,7 +49,7 @@ function display_pictures( $mysql_result, $maxtime, $validation_box = false )
|
||||
$file = get_filename_wo_extension( $subrow['file'] );
|
||||
// name of the picture
|
||||
$name = $array_cat_names[$subrow['cat_id']].' > ';
|
||||
if ( $subrow['name'] != '' )
|
||||
if ( isset( $subrow['name'] ) and $subrow['name'] != '' )
|
||||
{
|
||||
$name.= $subrow['name'];
|
||||
}
|
||||
@@ -159,8 +159,8 @@ $tpl = array( 'stats_last_days','delete','close','submit','open' );
|
||||
templatize_array( $tpl, 'lang', $sub );
|
||||
$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
|
||||
//--------------------------------------------------- number of days to display
|
||||
if ( isset( $_GET['last_days'] ) ) define( "MAX_DAYS", $_GET['last_days'] );
|
||||
else define( "MAX_DAYS", 0 );
|
||||
if ( isset( $_GET['last_days'] ) ) define( 'MAX_DAYS', $_GET['last_days'] );
|
||||
else define( 'MAX_DAYS', 0 );
|
||||
//----------------------------------------- non specific section initialization
|
||||
$array_cat_directories = array();
|
||||
$array_cat_names = array();
|
||||
|
||||
Reference in New Issue
Block a user