archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove all array_push (50% slower than []) + some changes missing for feature:2978

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@25018 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-10-19 17:43:04 +00:00
commit ae707279a1
89 changed files with 700 additions and 1084 deletions
Download patch file Download diff file Expand all files Collapse all files

38
admin/include/functions_history.inc.php
View file

@ -58,18 +58,12 @@ SELECT
if (isset($search['fields']['date-after']))
{
array_push(
$clauses,
"date >= '".$search['fields']['date-after']."'"
);
$clauses[] = "date >= '".$search['fields']['date-after']."'";
}
if (isset($search['fields']['date-before']))
{
array_push(
$clauses,
"date <= '".$search['fields']['date-before']."'"
);
$clauses[] = "date <= '".$search['fields']['date-before']."'";
}
if (isset($search['fields']['types']))
@ -88,34 +82,25 @@ SELECT
$clause.= "= '".$type."'";
}
array_push($local_clauses, $clause);
$local_clauses[] = $clause;
}
}
if (count($local_clauses) > 0)
{
array_push(
$clauses,
implode(' OR ', $local_clauses)
);
$clauses[] = implode(' OR ', $local_clauses);
}
}
if (isset($search['fields']['user'])
and $search['fields']['user'] != -1)
{
array_push(
$clauses,
'user_id = '.$search['fields']['user']
);
$clauses[] = 'user_id = '.$search['fields']['user'];
}
if (isset($search['fields']['image_id']))
{
array_push(
$clauses,
'image_id = '.$search['fields']['image_id']
);
$clauses[] = 'image_id = '.$search['fields']['image_id'];
}
if (isset($search['fields']['filename']))
@ -123,14 +108,11 @@ SELECT
if (count($search['image_ids']) == 0)
{
// a clause that is always false
array_push($clauses, '1 = 2 ');
$clauses[] = '1 = 2 ';
}
else
{
array_push(
$clauses,
'image_id IN ('.implode(', ', $search['image_ids']).')'
);
$clauses[] = 'image_id IN ('.implode(', ', $search['image_ids']).')';
}
}
@ -168,7 +150,7 @@ SELECT
while ($row = pwg_db_fetch_assoc($result))
{
array_push($data, $row);
$data[] = $row;
}
return $data;
@ -177,4 +159,4 @@ SELECT
add_event_handler('get_history', 'get_history', EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
trigger_action('functions_history_included');
?>
?>