diff options
-rw-r--r-- | apps/files_versions/lib/versions.php | 6 | ||||
-rw-r--r-- | core/ajax/share.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index f99e26a0915..6da0e434541 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -53,7 +53,7 @@ class Storage { * @return mixed versions size or false if no versions size is stored */ private static function getVersionsSize($user) { - $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_versions WHERE user=?'); + $query = \OC_DB::prepare('SELECT `size` FROM *PREFIX*files_versions WHERE `user`=?'); $result = $query->execute(array($user))->fetchAll(); if ($result) { @@ -70,9 +70,9 @@ class Storage { */ private static function setVersionsSize($user, $size) { if ( self::getVersionsSize($user) === false) { - $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (size, user) VALUES (?, ?)'); + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (`size`, `user`) VALUES (?, ?)'); }else { - $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET size=? WHERE user=?'); + $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET `size`=? WHERE `user`=?'); } $query->execute(array($size, $user)); } diff --git a/core/ajax/share.php b/core/ajax/share.php index 7ebd8949710..5854b65aa03 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -95,12 +95,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // setup the email $subject = (string)$l->t('User %s shared a file with you', $displayName); - if ($type === 'dir') + if ($type === 'folder') $subject = (string)$l->t('User %s shared a folder with you', $displayName); $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); - if ($type === 'dir') + if ($type === 'folder') $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); |