Permalink
Browse files

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

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 db684f6.

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 8d58256
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Wed Mar 21 23:40:36 2018 +0100

    new feedcreator version for PHP7

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

    php72 fixes, replaces each() function

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

    More fixes for PHP7.2

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

    Some more replacements of create_function

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

    Fixed indents

commit 8d58b63
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 c8b12a2
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 db684f6
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Thu Jan 18 00:23:24 2018 +0100

    Update Smarty to 3.1.3

commit 6a3f8f3
Author: Rob Lensen <rob@bsdfreaks.nl>
Date:   Wed Jan 17 23:40:27 2018 +0100

    Initial work to support PHP 7.2
  • Loading branch information...
plegall committed Jul 12, 2018
1 parent d1c2e71 commit 063711240ac9ea9ddb1420bdb8ed8ee316f643f5
@@ -377,7 +377,7 @@
{
$tags_string = preg_replace_callback(
'/(\d+)/',
create_function('$m', 'global $name_of_tag; return isset($name_of_tag[$m[1]]) ? $name_of_tag[$m[1]] : $m[1];'),
function($m) use ($name_of_tag) { return isset($name_of_tag[$m[1]]) ? $name_of_tag[$m[1]] : $m[1];} ,
str_replace(
',',
', ',
@@ -675,7 +675,7 @@ function update_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 @@ function get_fulldirs($cat_ids)
$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)
@@ -89,7 +89,7 @@ function check_sendmail_timeout()
*/
function quote_check_key_list($check_key_list = array())
{
return array_map(create_function('$s', 'return \'\\\'\'.$s.\'\\\'\';'), $check_key_list);
return array_map(function($s) { return '\''.$s.'\''; } , $check_key_list);
}
/*
@@ -543,4 +543,4 @@ function subscribe_notification_by_mail($is_admin_request, $check_key_list = arr
return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list);
}
?>
?>
@@ -181,10 +181,7 @@
'('.
implode(' AND ',
array_map(
create_function(
'$s',
'return "content LIKE \'%$s%\'";'
),
function($s) {return "content LIKE \'%$s%\'"; } ,
preg_split('/[\s,;]+/', $_GET['keyword'] )
)
).
@@ -562,4 +559,4 @@
if (count($comments) > 0) $template->assign_var_from_handle('COMMENT_LIST', 'comment_list');
$template->pparse('comments');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>
?>
@@ -400,9 +400,9 @@ function mass_updates($tablename, $dbfields, $datas, $flags=0)
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 @@ function mass_updates($tablename, $dbfields, $datas, $flags=0)
implode(
"\n AND ",
array_map(
create_function('$s', 'return "t1.$s = t2.$s";'),
function($s) { return "t1.$s = t2.$s"; },
$dbfields['primary']
)
);
@@ -241,7 +241,7 @@ public function emogrify() {
$nodesWithStyleAttributes = $xpath->query('//*[@style]');
if ($nodesWithStyleAttributes !== FALSE) {
$callback = create_function('$m', 'return strtolower($m[0]);');
$callback = function($m) { return strtolower($m[0]); };
/** @var $nodeWithStyleAttribute \DOMNode */
foreach ($nodesWithStyleAttributes as $node) {
Oops, something went wrong.

0 comments on commit 0637112

Please sign in to comment.