Icewind destroyed my changes :-(

diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index d611e59eb3157a6a2283888634c4556b21d56b53..b29b842d23a2eaaebf9fa6e16ed62962f9f16599 100644 (file)
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -28,8 +28,8 @@ if(OC_App::getCurrentApp()=='files'){
 
 OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 
-OC_APP::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_HELPER::linkTo( 'media', 'index.php' ), 'icon' => OC_HELPER::imagePath( 'media', 'media.png' ), 'name' => 'Media' ));
-OC_APP::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_HELPER::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_HELPER::imagePath( 'media', 'media.png' )));
+OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Media' ));
+OC_App::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_Helper::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_Helper::imagePath( 'media', 'media.png' )));
 
 // add subnavigations
 $entry = array(
@@ -38,26 +38,26 @@ $entry = array(
        'href' => '#playlist',
        'name' => 'Playlist'
 );
-OC_APP::addNavigationSubEntry( "media_index", $entry);
+OC_App::addNavigationSubEntry( "media_index", $entry);
 $entry = array(
        'id' => "media_collection",
        'order'=>1,
        'href' => '#collection',
        'name' => 'Collection'
 );
-OC_APP::addNavigationSubEntry( "media_index", $entry);
+OC_App::addNavigationSubEntry( "media_index", $entry);
 // $entry = array(
 //     'id' => "media_recent",
 //     'order'=>1,
 //     'href' => '#recent',
 //     'name' => 'Most Recent'
 // );
-// OC_APP::addNavigationSubEntry( "media_index", $entry);
+// OC_App::addNavigationSubEntry( "media_index", $entry);
 // $entry = array(
 //     'id' => "media_mostplayer",
 //     'order'=>1,
 //     'href' => '#mostplayed',
 //     'name' => 'Most Played'
 // );
-// OC_APP::addNavigationSubEntry( "media_index", $entry);
+// OC_App::addNavigationSubEntry( "media_index", $entry);
 ?>

diff --git a/apps/media/index.php b/apps/media/index.php
index 0fe7c12f63c60b9e7f9492a38ee02207bfd05290..43423d27de6592ffa31ba2aace5e6dbbe2941b94 100644 (file)
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -33,21 +33,21 @@ if( !OC_User::isLoggedIn()){
 require_once('lib_collection.php');
 require_once('lib_scanner.php');
 
-OC_UTIL::addScript('media','player');
-OC_UTIL::addScript('media','music');
-OC_UTIL::addScript('media','playlist');
-OC_UTIL::addScript('media','collection');
-OC_UTIL::addScript('media','jquery.jplayer.min');
-OC_UTIL::addStyle('media','player');
-OC_UTIL::addStyle('media','music');
+OC_Util::addScript('media','player');
+OC_Util::addScript('media','music');
+OC_Util::addScript('media','playlist');
+OC_Util::addScript('media','collection');
+OC_Util::addScript('media','jquery.jplayer.min');
+OC_Util::addStyle('media','player');
+OC_Util::addStyle('media','music');
 
-OC_APP::setActiveNavigationEntry( 'media_playlist' );
+OC_App::setActiveNavigationEntry( 'media_playlist' );
 
 $tmpl = new OC_Template( 'media', 'music', 'user' );
 
-$player = new OC_TEMPLATE( 'media', 'player');
-$playlist = new OC_TEMPLATE( 'media', 'playlist');
-$collection= new OC_TEMPLATE( 'media', 'collection');
+$player = new OC_Template( 'media', 'player');
+$playlist = new OC_Template( 'media', 'playlist');
+$collection= new OC_Template( 'media', 'collection');
 
 $tmpl->assign('player',$player->fetchPage());
 $tmpl->assign('playlist',$playlist->fetchPage());