From 0da0513d3292b9dfefa8c5869e5894b34eb50dcc Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 15 Aug 2014 21:15:49 -0400
Subject: [PATCH 1/4] Fix an undefined duplicatePhotos error.

---
 src/templates/upload-confirm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/upload-confirm.php b/src/templates/upload-confirm.php
index e809bf10b..0ff4b209b 100644
--- a/src/templates/upload-confirm.php
+++ b/src/templates/upload-confirm.php
@@ -39,7 +39,7 @@
   <hr>
 <?php } ?>
 
-<?php if(count($duplicatePhotos) > 0) { ?>
+<?php if(isset($duplicatePhotos) && count($duplicatePhotos) > 0) { ?>
   <strong><span class="label label-warning"><?php echo count($duplicatePhotos); ?> of them already existed in your account.</span></strong>
   <div class="upload-preview">
     <ul class="thumbnails duplicates">

From 026eac32abf7b130eed0df90f89a33be27d3c0df Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 15 Aug 2014 21:16:21 -0400
Subject: [PATCH 2/4] Fix the label.

---
 src/templates/upload-beta.php | 2 +-
 src/templates/upload.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/upload-beta.php b/src/templates/upload-beta.php
index 4e9488ac8..61f5879bf 100644
--- a/src/templates/upload-beta.php
+++ b/src/templates/upload-beta.php
@@ -19,7 +19,7 @@
       </div>
 
       <div class="control-group">
-        <label for="tags">Permission</label>
+        <label for="permission">Permission</label>
         <div class="controls">
           <label class="radio inline private">
             <input type="radio" name="permission" value="0"<?php if($preferences['permission'] === false || $preferences['permission'] === '0') { ?> checked="checked"<?php } ?>>
diff --git a/src/templates/upload.php b/src/templates/upload.php
index 842e7d5ce..3b0ded5d0 100644
--- a/src/templates/upload.php
+++ b/src/templates/upload.php
@@ -34,7 +34,7 @@
         </div>
 
         <div class="control-group">
-          <label for="tags">Permission</label>
+          <label for="permission">Permission</label>
           <div class="controls">
             <label class="radio inline private">
               <input type="radio" name="permission" value="0"<?php if($preferences['permission'] === false || $preferences['permission'] === '0') { ?> checked="checked"<?php } ?>>

From bc5e8cedaad2a36805e5b4f6f14a915fc3f25283 Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 15 Aug 2014 23:26:46 -0400
Subject: [PATCH 3/4] Bug #1521 - Properly save the sticky permission.

For some reason the order matter as it seems to override the "extra" JSON
---
 src/libraries/controllers/ApiPhotoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/controllers/ApiPhotoController.php b/src/libraries/controllers/ApiPhotoController.php
index a17bf9a72..c74eec330 100644
--- a/src/libraries/controllers/ApiPhotoController.php
+++ b/src/libraries/controllers/ApiPhotoController.php
@@ -512,8 +512,8 @@ public function upload()
       $this->plugin->setData('photo', $photo);
       $this->plugin->invoke('onPhotoUploaded');
 
-      $this->user->setAttribute('stickyPermission', $permission);
       $this->user->setAttribute('stickyLicense', $photo['license']);
+      $this->user->setAttribute('stickyPermission', $permission);
       return $this->created("Photo {$photoId} uploaded successfully", $photo);
     }
 

From 805cfdd1dd338dd595147ab9fee5d7bfda459016 Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Fri, 15 Aug 2014 23:31:16 -0400
Subject: [PATCH 4/4] Bug #1521 - Add User::setAttributes() to make the sticky
 option do less queries.

---
 src/libraries/controllers/ApiPhotoController.php |  3 +--
 src/libraries/models/User.php                    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/libraries/controllers/ApiPhotoController.php b/src/libraries/controllers/ApiPhotoController.php
index c74eec330..7e02f6a1d 100644
--- a/src/libraries/controllers/ApiPhotoController.php
+++ b/src/libraries/controllers/ApiPhotoController.php
@@ -512,8 +512,7 @@ public function upload()
       $this->plugin->setData('photo', $photo);
       $this->plugin->invoke('onPhotoUploaded');
 
-      $this->user->setAttribute('stickyLicense', $photo['license']);
-      $this->user->setAttribute('stickyPermission', $permission);
+      $this->user->setAttributes(array('stickyLicense' => $photo['license'], 'stickyPermission' => $permission));
       return $this->created("Photo {$photoId} uploaded successfully", $photo);
     }
 
diff --git a/src/libraries/models/User.php b/src/libraries/models/User.php
index c776cc494..ead628541 100644
--- a/src/libraries/models/User.php
+++ b/src/libraries/models/User.php
@@ -353,6 +353,22 @@ public function setAttribute($name, $value)
     return $this->update(array($name => $value));
   }
 
+  /**
+    * Set several attributes.
+    *
+    * @return boolean
+    */
+  public function setAttributes($attrs)
+  {
+    $new_array = array();
+    $keys = array_keys($attrs);
+    foreach ($attrs as $name => $value) {
+      $new_name = $this->getAttributeName($name);
+      $new_array[$new_name] = $attrs[$name];
+    }
+    return $this->update($new_array);
+  }
+
   /**
     * Set the session email.
     *