mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-20 16:42:59 +02:00
Squashed commit of the following:
commit 7190866ccf15033f27095d635546e46dacbb755e Author: plegall <plg@piwigo.org> Date: Thu Jul 12 10:52:33 2018 +0200 Revert "Replace not maintained cssmin with fork from github https://github.com/natxet/CssMin" This reverts commitc8b12a2ed0. commit 1dac11ecb6783d0d5353c3d250388f018c30fc5c Author: plegall <plg@piwigo.org> Date: Thu Jul 12 10:52:24 2018 +0200 Revert "Update Smarty to 3.1.3" This reverts commitdb684f6151. commit 3ac752dc93912ba5701d22dadd9bb3b81e5bb383 Merge:d1c2e718d58256Author: plegall <plg@piwigo.org> Date: Thu Jul 12 10:50:43 2018 +0200 Merge branch 'php72' of https://github.com/Infern1/Piwigo into Infern1-php72 commit8d58256c45Author: Rob Lensen <rob@bsdfreaks.nl> Date: Wed Mar 21 23:40:36 2018 +0100 new feedcreator version for PHP7 commitbb0fcc3a30Author: Rob Lensen <rob@bsdfreaks.nl> Date: Wed Mar 21 23:26:27 2018 +0100 php72 fixes, replaces each() function commit3db22c0d33Author: Rob Lensen <rob@bsdfreaks.nl> Date: Wed Mar 21 23:02:46 2018 +0100 More fixes for PHP7.2 commit50d8aafc77Author: Rob Lensen <rob@bsdfreaks.nl> Date: Mon Mar 19 23:55:21 2018 +0100 Some more replacements of create_function commit8263335c42Author: Rob Lensen <rob@bsdfreaks.nl> Date: Mon Mar 19 22:54:54 2018 +0100 Fixed indents commit8d58b637c6Merge:c8b12a28a57d77Author: Rob Lensen <rob@bsdfreaks.nl> Date: Tue Feb 27 13:51:32 2018 +0100 Merge remote-tracking branch 'upstream/master' into php72 commitc8b12a2ed0Author: Rob Lensen <rob@bsdfreaks.nl> Date: Thu Jan 18 00:32:46 2018 +0100 Replace not maintained cssmin with fork from github https://github.com/natxet/CssMin commitdb684f6151Author: Rob Lensen <rob@bsdfreaks.nl> Date: Thu Jan 18 00:23:24 2018 +0100 Update Smarty to 3.1.3 commit6a3f8f3e76Author: Rob Lensen <rob@bsdfreaks.nl> Date: Wed Jan 17 23:40:27 2018 +0100 Initial work to support PHP 7.2
This commit is contained in:
@@ -675,7 +675,7 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
|
||||
|
||||
$datas = array();
|
||||
|
||||
$cat_map_callback = create_function('$m', 'global $cat_map; return $cat_map[$m[1]]["rank"];');
|
||||
$cat_map_callback = function($m) use ($cat_map) { return $cat_map[$m[1]]["rank"]; };
|
||||
|
||||
foreach( $cat_map as $id=>$cat )
|
||||
{
|
||||
@@ -1051,7 +1051,7 @@ SELECT id, uppercats, site_id
|
||||
$categories = query2array($query);
|
||||
|
||||
// filling $cat_fulldirs
|
||||
$cat_dirs_callback = create_function('$m', 'global $cat_dirs; return $cat_dirs[$m[1]];');
|
||||
$cat_dirs_callback = function($m) use ($cat_dirs) { return $cat_dirs[$m[1]]; };
|
||||
|
||||
$cat_fulldirs = array();
|
||||
foreach ($categories as $category)
|
||||
|
||||
Reference in New Issue
Block a user