Some last minute tweaks to get the new avatar system working.

thewca · Sep 2, 2015 · a62ec4d · a62ec4d
1 parent 6f3cc9e
commit a62ec4d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/secrets/upload/.gitignore b/secrets/upload/.gitignore
diff --git a/secrets/upload/declined/.gitignore b/secrets/upload/declined/.gitignore
diff --git a/secrets/upload/old/.gitignore b/secrets/upload/old/.gitignore
diff --git a/webroot/results/includes/_framework.php b/webroot/results/includes/_framework.php
@@ -225,6 +225,6 @@ function getCurrentPictureFile ($personId) {
     return "/uploads/user/avatar/${personId}/${user['avatar']}";
   }
   # Match only filenames that end in a number (to avoid 1234_thumb.png)
-  $files = glob("uploads/user/avatar/${personId}/*[0-9].{jpg,jpeg,gif,png}");
+  $files = glob("uploads/user/avatar/${personId}/*[0-9].*");
   return $files ? "/" . end($files) : FALSE;
 }