adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 09:03:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
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 commit c8b12a2ed0.

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 commit db684f6151.

commit 3ac752dc93912ba5701d22dadd9bb3b81e5bb383
Merge: d1c2e71 8d58256
Author: 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

commit 8d58256c45
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Wed Mar 21 23:40:36 2018 +0100

    new feedcreator version for PHP7

commit bb0fcc3a30
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Wed Mar 21 23:26:27 2018 +0100

    php72 fixes, replaces each() function

commit 3db22c0d33
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Wed Mar 21 23:02:46 2018 +0100

    More fixes for PHP7.2

commit 50d8aafc77
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Mon Mar 19 23:55:21 2018 +0100

    Some more replacements of create_function

commit 8263335c42
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Mon Mar 19 22:54:54 2018 +0100

    Fixed indents

commit 8d58b637c6
Merge: c8b12a2 8a57d77
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Tue Feb 27 13:51:32 2018 +0100

    Merge remote-tracking branch 'upstream/master' into php72

commit c8b12a2ed0
Author: 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

commit db684f6151
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Thu Jan 18 00:23:24 2018 +0100

    Update Smarty to 3.1.3

commit 6a3f8f3e76
Author: 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:
plegall
2018-07-12 10:52:55 +02:00
parent d1c2e71a56
commit 063711240a
13 changed files with 1762 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dblayer/functions_mysqli.inc.php
+3 -3
View File
@@ -400,9 +400,9 @@ CREATE TABLE '.$temporary_tablename.'
mass_inserts($temporary_tablename, $all_fields, $datas);
if ($flags & MASS_UPDATES_SKIP_EMPTY)
$func_set = create_function('$s', 'return "t1.$s = IFNULL(t2.$s, t1.$s)";');
$func_set = function($s) { return "t1.$s = IFNULL(t2.$s, t1.$s)"; };
else
$func_set = create_function('$s', 'return "t1.$s = t2.$s";');
$func_set = function($s) { return "t1.$s = t2.$s"; };
// update of table by joining with temporary table
$query = '
@@ -416,7 +416,7 @@ UPDATE '.$tablename.' AS t1, '.$temporary_tablename.' AS t2
implode(
"\n AND ",
array_map(
create_function('$s', 'return "t1.$s = t2.$s";'),
function($s) { return "t1.$s = t2.$s"; },
$dbfields['primary']
)
);