Correction of path looking for apps and css

diff --git a/apps/contacts/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
index c9b24a5ebe9e0c6871a488aeda82a3ac9592c941..a9ba4746e0762e0b3457d1d71f8b636982f349a4 100644 (file)
--- a/apps/contacts/css/jquery.Jcrop.css
+++ b/apps/contacts/css/jquery.Jcrop.css
@@ -14,7 +14,7 @@
 }
 
 .jcrop-vline, .jcrop-hline {
-       background: white url('%webroot%/apps/contacts/img/Jcrop.gif') top left repeat;
+       background: white url('%appswebroot%/contacts/img/Jcrop.gif') top left repeat;
        font-size: 0px;
        position: absolute;
 }

diff --git a/lib/db.php b/lib/db.php
index bcc8657b4a4a638ef1e1486ebaf5fbedc086a362..dc9e3392d0a8733395a8d53a4f1fcf1fd630a7f2 100644 (file)
--- 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 5939ba32e50d76ba10827506059e381b5b090ef0..f26b4b256739d02f57cabbfdbdb6cc49e1b604b3 100644 (file)
--- 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;
                        }