diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 17:34:07 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 17:34:07 +0000 |
commit | 716f70cd31e6126f8752cb8843cca104ad91d8f6 (patch) | |
tree | 616c9d52b4bfe4ce1c4383707b9dc8f397eb9603 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | minor: correct slightly over-enthusiastic load iar logging message (diff) | |
download | opensim-SC_OLD-716f70cd31e6126f8752cb8843cca104ad91d8f6.zip opensim-SC_OLD-716f70cd31e6126f8752cb8843cca104ad91d8f6.tar.gz opensim-SC_OLD-716f70cd31e6126f8752cb8843cca104ad91d8f6.tar.bz2 opensim-SC_OLD-716f70cd31e6126f8752cb8843cca104ad91d8f6.tar.xz |
refactor out iar escaping
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 6c37198..bbb49f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -362,13 +362,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
362 | /// <returns></returns> | 362 | /// <returns></returns> |
363 | public static string CreateArchiveFolderName(string name, UUID id) | 363 | public static string CreateArchiveFolderName(string name, UUID id) |
364 | { | 364 | { |
365 | // Only encode ampersands (for escaping anything) and / (since this is used as general dir separator). | ||
366 | name = name.Replace("&", "&"); | ||
367 | name = name.Replace("/", "/"); | ||
368 | |||
369 | return string.Format( | 365 | return string.Format( |
370 | "{0}{1}{2}/", | 366 | "{0}{1}{2}/", |
371 | name, | 367 | InventoryArchiveUtils.EscapeArchivePath(name), |
372 | ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, | 368 | ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, |
373 | id); | 369 | id); |
374 | } | 370 | } |
@@ -381,12 +377,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
381 | /// <returns></returns> | 377 | /// <returns></returns> |
382 | public static string CreateArchiveItemName(string name, UUID id) | 378 | public static string CreateArchiveItemName(string name, UUID id) |
383 | { | 379 | { |
384 | name = name.Replace("&", "&"); | ||
385 | name = name.Replace("/", "/"); | ||
386 | |||
387 | return string.Format( | 380 | return string.Format( |
388 | "{0}{1}{2}.xml", | 381 | "{0}{1}{2}.xml", |
389 | name, | 382 | InventoryArchiveUtils.EscapeArchivePath(name), |
390 | ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, | 383 | ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, |
391 | id); | 384 | id); |
392 | } | 385 | } |