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

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();