summaryrefslogtreecommitdiffstats
path: root/lib/migration/content.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/migration/content.php')
-rw-r--r--lib/migration/content.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/migration/content.php b/lib/migration/content.php
index fe8a21a45b4..d25b5af293c 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -53,7 +53,7 @@ class OC_Migration_Content{
$query = $this->processQuery( $query );
// Optimize the query
- $query = $this->MDB2->prepare( $query );
+ $query = $this->db->prepare( $query );
// Die if we have an error (error means: bad query, not 0 results!)
if( PEAR::isError( $query ) ) {
@@ -174,7 +174,9 @@ class OC_Migration_Content{
$dirname = basename($dir);
$this->zip->addEmptyDir($internaldir . $dirname);
$internaldir.=$dirname.='/';
-
+ if( !file_exists( $dir ) ){
+ return false;
+ }
if ($dirhandle = opendir($dir)) {
while (false !== ( $file = readdir($dirhandle))) {