aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Przybylski <bart.p.pl@gmail.com>2012-03-15 00:09:06 +0100
committerBartek Przybylski <bart.p.pl@gmail.com>2012-03-15 00:09:06 +0100
commit0fadbee69941efe7d08dc8533145046a9cccb76e (patch)
tree04483cf074b87cb99677d73a52b0f00f64d79f67
parent193e93e4a9f7d9f2c9c812fb217011d13c9d1237 (diff)
downloadnextcloud-server-0fadbee69941efe7d08dc8533145046a9cccb76e.tar.gz
nextcloud-server-0fadbee69941efe7d08dc8533145046a9cccb76e.zip
fix adding photo to incorrect gallery
-rw-r--r--apps/gallery/lib/scanner.php2
-rw-r--r--lib/filecache.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 0fa4d08d3ba..5791662522a 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -52,7 +52,7 @@ class OC_Gallery_Scanner {
// don't duplicate galleries with same path
if (!($albumId = $result->fetchRow())) {
OC_Gallery_Album::create($owner, $name, $path);
- $result = OC_Gallery_Album::find($owner, $name);
+ $result = OC_Gallery_Album::find($owner, $name, $path);
$albumId = $result->fetchRow();
}
$albumId = $albumId['album_id'];
diff --git a/lib/filecache.php b/lib/filecache.php
index 15eec43abe5..280a9929db0 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -522,7 +522,7 @@ class OC_FileCache{
}
/**
- * fine files by mimetype
+ * find files by mimetype
* @param string $part1
* @param string $part2 (optional)
* @param string root (optional)