mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 12:19:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use query2array + removed unused declaration

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@31030 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2015-03-12 19:46:33 +00:00
parent 05d8f5466b
commit c7ea93cba3
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/derivative_std_params.inc.php
View file

@ -201,8 +201,6 @@ final class ImageStdParams
*/ */
static function save() static function save()
{ {
global $conf;
$ser = serialize( array( $ser = serialize( array(
'd' => self::$type_map, 'd' => self::$type_map,
'q' => self::$quality, 'q' => self::$quality,

4
include/functions_category.inc.php
View file

@ -335,7 +335,7 @@ SELECT DISTINCT(id)
} }
$query.= ' $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 // Piwigo before 2.5.3 may have generated inconsistent permissions, ie
// private album A1/A2 permitted to user U1 but private album A1 not // private album A1/A2 permitted to user U1 but private album A1 not
// permitted to U1. // permitted to U1.
// //
// TODO 2.7: add an upgrade script to repair permissions and remove this // TODO 2.7: add an upgrade script to repair permissions and remove this
// test // test
if ( !isset($cats[ $cat['id_uppercat'] ])) if ( !isset($cats[ $cat['id_uppercat'] ]))