From 34f05ba180792afb40d953b6cf8595a4513eb972 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sat, 3 Mar 2012 14:35:17 +0000
Subject: [PATCH] Udpdate bookmarks migration provider. App version included in
 export.

---
 apps/bookmarks/lib/migrate.php |  2 +-
 lib/migrate.php                | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/bookmarks/lib/migrate.php b/apps/bookmarks/lib/migrate.php
index 86a5b957257..c655154d41b 100644
--- a/apps/bookmarks/lib/migrate.php
+++ b/apps/bookmarks/lib/migrate.php
@@ -63,7 +63,7 @@ class OC_Migrate_Provider_Bookmarks extends OC_Migrate_Provider{
 			}	
 		}
 		
-		return $bookmarks;
+		return $doc;
 		
 	}
 	
diff --git a/lib/migrate.php b/lib/migrate.php
index c5def5b5830..5179e431996 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -51,12 +51,17 @@ class OC_Migrate{
 			
 			OC_Log::write('user_migrate','Getting app data for app:'.$provider->appid,OC_Log::INFO);
 			$app = $doc->createElement('app');
-			$doc->appendChild($app);
+			$app = $doc->appendChild($app);
+			$app->setAttribute('id',$provider->appid);
 			// Append app info
-			$app = $doc->appendChild( self::appInfoXML( $provider->appid ) );
+			$appinfo = $doc->importNode( self::appInfoXML( $provider->appid )->documentElement, true );
+			$app->appendChild( $appinfo );
 			
+			$appdata = $doc->createElement('appdata');
+			$appdata = $app->appendChild($appdata);
 			// Add the app data
-			$app->appendChild($provider->export($uid));
+			$appdatanode = $doc->importNode( $provider->export($uid)->documentElement, true );
+			$appdata->appendChild( $appdatanode );
 
 		}
 
@@ -69,12 +74,17 @@ class OC_Migrate{
 	* @return string xml app info
 	*/
 	public static function appInfoXML($appid){
+		
+		$info = OC_App::getAppInfo($appid);
+		
 		$doc = new DOMDocument();
 		$appinfo = $doc->createElement('appinfo');
 		$appinfo = $doc->appendChild($appinfo);
-		$data = $doc->createTextNode($appid);
-		$appinfo->appendChild($data);
+		$version = $doc->createElement('version');
+		$appinfo->appendChild($version);
+		$versionval = $doc->createTextNode($info['version']);
+		$version->appendChild($versionval);
 		
-		return $appinfo;	
+		return $doc;	
 	}
 }