diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-22 20:58:28 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-22 20:58:52 +0000 |
| commit | b5e3e150eb9737022d0c9080e84bac4d290c96a7 (patch) | |
| tree | 8e12feba08f0b16bd225d0136f9e70e6c0dd6464 /lib | |
| parent | ded9ea5ad3fd46516ca9ea7849dbdfbe753a1dc5 (diff) | |
| download | nextcloud-server-b5e3e150eb9737022d0c9080e84bac4d290c96a7.tar.gz nextcloud-server-b5e3e150eb9737022d0c9080e84bac4d290c96a7.zip | |
Correction of path looking for apps and css
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/db.php | 2 | ||||
| -rw-r--r-- | lib/migrate.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/db.php b/lib/db.php index bcc8657b4a4..dc9e3392d0a 100644 --- a/lib/db.php +++ b/lib/db.php @@ -526,7 +526,7 @@ class OC_DB { self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' ); foreach($apps as $app){ - $path = OC::$SERVERROOT.'/apps/'.$app.'/appinfo/database.xml'; + $path = self::getAppPath($app).'/appinfo/database.xml'; if(file_exists($path)){ self::removeDBStructure( $path ); } diff --git a/lib/migrate.php b/lib/migrate.php index 5939ba32e50..f26b4b25673 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -64,7 +64,7 @@ class OC_Migrate{ $apps = OC_App::getAllApps(); foreach($apps as $app){ - $path = OC::$SERVERROOT . '/apps/' . $app . '/appinfo/migrate.php'; + $path = self::getAppPath($app) . '/appinfo/migrate.php'; if( file_exists( $path ) ){ include( $path ); } @@ -398,7 +398,7 @@ class OC_Migrate{ if( OC_App::isEnabled( $provider->getID() ) ){ $success = true; // Does this app use the database? - if( file_exists( OC::$SERVERROOT.'/apps/'.$provider->getID().'/appinfo/database.xml' ) ){ + if( file_exists( self::getAppPath($provider->getID()).'/appinfo/database.xml' ) ){ // Create some app tables $tables = self::createAppTables( $provider->getID() ); if( is_array( $tables ) ){ @@ -539,7 +539,7 @@ class OC_Migrate{ } // There is a database.xml file - $content = file_get_contents( OC::$SERVERROOT . '/apps/' . $appid . '/appinfo/database.xml' ); + $content = file_get_contents(self::getAppPath($appid) . '/appinfo/database.xml' ); $file2 = 'static://db_scheme'; // TODO get the relative path to migration.db from the data dir @@ -608,7 +608,7 @@ class OC_Migrate{ static public function getApps(){ $allapps = OC_App::getAllApps(); foreach($allapps as $app){ - $path = OC::$SERVERROOT . '/apps/' . $app . '/lib/migrate.php'; + $path = self::getAppPath($app) . '/lib/migrate.php'; if( file_exists( $path ) ){ $supportsmigration[] = $app; } |