diff options
| -rw-r--r-- | apps/files/ajax/upload.php | 4 | ||||
| -rwxr-xr-x | apps/files_external/lib/dropbox.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index a5ce7b257da..9750173d110 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -88,7 +88,9 @@ foreach ($_FILES['files']['error'] as $error) { UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'), UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'), ); - OCP\JSON::error(array('data' => array_merge(array('message' => $errors[$error]), $storageStats))); + $errorMessage = $errors[$error]; + \OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files')); + OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats))); exit(); } } diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 0b624b27176..9f297d22dcb 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -44,7 +44,7 @@ class Dropbox extends \OC\Files\Storage\Common { $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root; $oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth->setToken($params['token'], $params['token_secret']); - $this->dropbox = new \Dropbox_API($oauth, 'dropbox'); + $this->dropbox = new \Dropbox_API($oauth, 'auto'); } else { throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed'); } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index ce9a212499a..d825ee9de15 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -59,7 +59,8 @@ OCA.Sharing.PublicApp = { x: $(document).width() * window.devicePixelRatio, a: 'true', file: encodeURIComponent(this.initialDir + $('#filename').val()), - t: $('#sharingToken').val() + t: $('#sharingToken').val(), + scalingup: 0 }; var img = $('<img class="publicpreview">'); |