Correction of path looking for apps and css
This commit is contained in:
parent
ded9ea5ad3
commit
b5e3e150eb
|
@ -14,7 +14,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.jcrop-vline, .jcrop-hline {
|
.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;
|
font-size: 0px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
|
@ -526,7 +526,7 @@ class OC_DB {
|
||||||
self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
|
self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
|
||||||
|
|
||||||
foreach($apps as $app){
|
foreach($apps as $app){
|
||||||
$path = OC::$SERVERROOT.'/apps/'.$app.'/appinfo/database.xml';
|
$path = self::getAppPath($app).'/appinfo/database.xml';
|
||||||
if(file_exists($path)){
|
if(file_exists($path)){
|
||||||
self::removeDBStructure( $path );
|
self::removeDBStructure( $path );
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,7 +64,7 @@ class OC_Migrate{
|
||||||
$apps = OC_App::getAllApps();
|
$apps = OC_App::getAllApps();
|
||||||
|
|
||||||
foreach($apps as $app){
|
foreach($apps as $app){
|
||||||
$path = OC::$SERVERROOT . '/apps/' . $app . '/appinfo/migrate.php';
|
$path = self::getAppPath($app) . '/appinfo/migrate.php';
|
||||||
if( file_exists( $path ) ){
|
if( file_exists( $path ) ){
|
||||||
include( $path );
|
include( $path );
|
||||||
}
|
}
|
||||||
|
@ -398,7 +398,7 @@ class OC_Migrate{
|
||||||
if( OC_App::isEnabled( $provider->getID() ) ){
|
if( OC_App::isEnabled( $provider->getID() ) ){
|
||||||
$success = true;
|
$success = true;
|
||||||
// Does this app use the database?
|
// 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
|
// Create some app tables
|
||||||
$tables = self::createAppTables( $provider->getID() );
|
$tables = self::createAppTables( $provider->getID() );
|
||||||
if( is_array( $tables ) ){
|
if( is_array( $tables ) ){
|
||||||
|
@ -539,7 +539,7 @@ class OC_Migrate{
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is a database.xml file
|
// 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';
|
$file2 = 'static://db_scheme';
|
||||||
// TODO get the relative path to migration.db from the data dir
|
// TODO get the relative path to migration.db from the data dir
|
||||||
|
@ -608,7 +608,7 @@ class OC_Migrate{
|
||||||
static public function getApps(){
|
static public function getApps(){
|
||||||
$allapps = OC_App::getAllApps();
|
$allapps = OC_App::getAllApps();
|
||||||
foreach($allapps as $app){
|
foreach($allapps as $app){
|
||||||
$path = OC::$SERVERROOT . '/apps/' . $app . '/lib/migrate.php';
|
$path = self::getAppPath($app) . '/lib/migrate.php';
|
||||||
if( file_exists( $path ) ){
|
if( file_exists( $path ) ){
|
||||||
$supportsmigration[] = $app;
|
$supportsmigration[] = $app;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue