diff options
author | Andy Staudacher <andy.st@gmail.com> | 2009-08-30 18:27:40 -0700 |
---|---|---|
committer | Andy Staudacher <andy.st@gmail.com> | 2009-08-30 18:27:40 -0700 |
commit | e7f5e0a9a3a19d535a69e19c4527800096ae1aaa (patch) | |
tree | 15662d3291b18ae0aefa6b2cea04d2f2fcf54740 /modules/exif | |
parent | df38a890a64dd33eafe3aed51ce8fde732cf8b8b (diff) | |
parent | 31dcdcc6ad6ce47c03265f3d6e499774a17ff727 (diff) |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/views/l10n_client.html.php
modules/organize/views/organize_tree.html.php
modules/server_add/helpers/server_add_event.php
Diffstat (limited to 'modules/exif')
-rw-r--r-- | modules/exif/helpers/exif_task.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php index c269b732..7c4c97c4 100644 --- a/modules/exif/helpers/exif_task.php +++ b/modules/exif/helpers/exif_task.php @@ -50,12 +50,18 @@ class exif_task_Core { ->orwhere("exif_records.dirty", 1) ->close_paren() ->find_all() as $item) { - if (microtime(true) - $start > 1.5) { - break; + // The query above can take a long time, so start the timer after its done + // to give ourselves a little time to actually process rows. + if (!isset($start)) { + $start = microtime(true); } - $completed++; exif::extract($item); + $completed++; + + if (microtime(true) - $start > 1.5) { + break; + } } list ($remaining, $total, $percent) = exif::stats(); |