--- ./offline/create.php.orig	2011-01-03 12:23:18.000000000 +0100
+++ ./offline/create.php	2011-01-03 15:08:29.000000000 +0100
@@ -54,7 +54,9 @@
 process_css_files();
 
 // Copy media files:
-process_media_files();
+if ($offlineConf['copyMediaFiles']) {
+	process_media_files();
+}
 
 // Process directory in which pages are stored:
 process_wiki_pages();
@@ -126,7 +128,7 @@
 	global $offlineConf;// Variables for offline plugin
 	
 	// Merge default values for offline plugin with user defined settings:
-	$optionsArr = array('template', 'dokuwikiProtocol', 'dokuwikiHost', 'dokuwikiRelativePath', 'wgetPathToBinary', 'wgetHttpUser', 'wgetHttpPasswd', 'archiverPathToBinary', 'archiverOptions', 'insertLinkBackToHome', 'writeLogFile');
+	$optionsArr = array('template', 'dokuwikiProtocol', 'dokuwikiHost', 'dokuwikiRelativePath', 'wgetPathToBinary', 'wgetHttpUser', 'wgetHttpPasswd', 'archiverPathToBinary', 'archiverOptions', 'insertLinkBackToHome', 'writeLogFile', 'copyMediaFiles');
 	foreach($optionsArr as $optionStr) {
 		log_msg(__LINE__, $optionStr . '=' . $conf['plugin']['offline'][$optionStr] . ' (Default: ' . $conf[$optionStr] . ')');
 		isset($conf['plugin']['offline'][$optionStr]) ? $offlineConf[$optionStr] = $conf['plugin']['offline'][$optionStr] : $offlineConf[$optionStr] = $conf[$optionStr];		
@@ -135,12 +137,21 @@
 	
 	$offlineConf['absolutePathToDokuwikiDirStr']      = dirname(__FILE__) . $offlineConf['pathDelimiterStr'] . '..' . $offlineConf['pathDelimiterStr'] . '..' . $offlineConf['pathDelimiterStr'] . '..';
 	$offlineConf['absolutePathToOfflinePluginDirStr'] = dirname(__FILE__);
-	$offlineConf['absolutePathToDataDirStr']          = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data';
-	$offlineConf['absolutePathToMediaDirStr']         = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'media';
-	$offlineConf['absolutePathToPagesDirStr']         = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'pages';
-	$offlineConf['absolutePathToTmpDirStr']           = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'tmp';
-//	$offlineConf['absolutePathToTmpSessionDirStr']    = $offlineConf['absolutePathToDokuwikiDirStr'] . '/data/tmp' . '/offline' . date('Y-m-d_His');
-	$offlineConf['absolutePathToTmpSessionDirStr']    = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'tmp' . $offlineConf['pathDelimiterStr'] . 'offline';
+	$offlineConf['absolutePathToDataDirStr']          = $conf['savedir'];
+#	$offlineConf['absolutePathToDataDirStr']          = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data';
+
+	$offlineConf['absolutePathToMediaDirStr']         = $conf['mediadir'];
+#	$offlineConf['absolutePathToMediaDirStr']         = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'media';
+
+	$offlineConf['absolutePathToPagesDirStr']         = $conf['datadir'];
+#	$offlineConf['absolutePathToPagesDirStr']         = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'pages';
+
+	$offlineConf['absolutePathToTmpDirStr']           = $conf['tmpdir'];
+#	$offlineConf['absolutePathToTmpDirStr']           = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'tmp';
+
+	$offlineConf['absolutePathToTmpSessionDirStr']    = $conf['tmpdir']  . $offlineConf['pathDelimiterStr'] . 'offline';
+#	$offlineConf['absolutePathToTmpSessionDirStr']    = $offlineConf['absolutePathToDokuwikiDirStr'] . $offlineConf['pathDelimiterStr'] . 'data' . $offlineConf['pathDelimiterStr'] . 'tmp' . $offlineConf['pathDelimiterStr'] . 'offline';
+
 	$offlineConf['pageExtensionStr']                  = 'txt';
 //	$offlineConf['dokuwikiBaseUrlStr']                = 'http://localhost/dokuwiki';
 	if ($offlineConf['dokuwikiRelativePath'] != '') {
@@ -763,4 +774,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
--- ./offline/conf/metadata.php.orig	2011-01-03 14:20:46.000000000 +0100
+++ ./offline/conf/metadata.php	2011-01-03 14:21:04.000000000 +0100
@@ -11,6 +11,7 @@
 $meta['archiverOptions']      = array('string');
 $meta['insertLinkBackToHome'] = array('onoff');
 $meta['writeLogFile']         = array('onoff');
+$meta['copyMediaFiles']       = array('onoff');
 
 
 
--- ./offline/conf/default.php.orig	2011-01-03 14:21:29.000000000 +0100
+++ ./offline/conf/default.php	2011-01-03 14:21:14.000000000 +0100
@@ -11,4 +11,5 @@
 $conf['archiverOptions']      = '-rvT';
 $conf['insertLinkBackToHome'] = 1;
 $conf['writeLogFile']         = 1;
+$conf['copyMediaFiles']       = 1;
 
--- ./offline/lang/de/settings.php.orig	2011-01-03 14:23:29.000000000 +0100
+++ ./offline/lang/de/settings.php	2011-01-03 14:24:27.000000000 +0100
@@ -11,3 +11,4 @@
 $lang['archiverOptions']      = 'Optionen für das Komprimierungsprogramm';
 $lang['insertLinkBackToHome'] = 'Link auf Startseite einfügen';
 $lang['writeLogFile']         = 'Log-Datei erzeugen (Verlangsamt das Backup. Nur empfohlen zur Fehlersuche)';
+$lang['copyMediaFiles']       = 'Medien-Dateien in Offline-Kopie mit einbeziehen';
--- ./offline/lang/en/settings.php.orig	2011-01-03 14:22:15.000000000 +0100
+++ ./offline/lang/en/settings.php	2011-01-03 14:23:19.000000000 +0100
@@ -11,3 +11,4 @@
 $lang['archiverOptions']      = 'Options for the archiver';
 $lang['insertLinkBackToHome'] = 'Insert Link to start page';
 $lang['writeLogFile']         = 'Create log file (slows backup down. Only recommended if errors occur while creating offline version)';
+$lang['copyMediaFiles']       = 'Include media files in offline version';