aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/derivative_std_params.inc.php2
-rw-r--r--include/functions_category.inc.php4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php
index 375eb18e9..a0f1edb76 100644
--- a/include/derivative_std_params.inc.php
+++ b/include/derivative_std_params.inc.php
@@ -201,8 +201,6 @@ final class ImageStdParams
*/
static function save()
{
- global $conf;
-
$ser = serialize( array(
'd' => self::$type_map,
'q' => self::$quality,
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 826ff9292..15ab84c25 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -335,7 +335,7 @@ SELECT DISTINCT(id)
}
$query.= '
;';
- return array_from_query($query, 'id');
+ return query2array($query, null, 'id');
}
/**
@@ -541,7 +541,7 @@ FROM '.CATEGORIES_TABLE.' as c
// Piwigo before 2.5.3 may have generated inconsistent permissions, ie
// private album A1/A2 permitted to user U1 but private album A1 not
// permitted to U1.
- //
+ //
// TODO 2.7: add an upgrade script to repair permissions and remove this
// test
if ( !isset($cats[ $cat['id_uppercat'] ]))