Merge remote branch 'origin/2.2.x' into 2.2.x

fusioninventory · May 16, 2012 · 68540d7 · 68540d7
2 parents 0ab900b + d41a3ff
commit 68540d7
Show file tree

Hide file tree

Showing 3 changed files with 417 additions and 417 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Softwares.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Softwares.pm
@@ -153,7 +153,7 @@ sub _getSoftwares {
                                 encodeFromRegistry($guid), # folder name
             COMMENTS         => encodeFromRegistry($data->{'/Comments'}),
             HELPLINK         => encodeFromRegistry($data->{'/HelpLink'}),
-            RELEASETYPE      => encodeFromRegistry($data->{'/ReleaseType'}),
+            RELEASE_TYPE     => encodeFromRegistry($data->{'/ReleaseType'}),
             VERSION          => encodeFromRegistry($data->{'/DisplayVersion'}),
             PUBLISHER        => encodeFromRegistry($data->{'/Publisher'}),
             URL_INFO_ABOUT   => encodeFromRegistry($data->{'/URLInfoAbout'}),

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
@@ -41,7 +41,7 @@ my %fields = (
     SOFTWARES   => [ qw/COMMENTS FILESIZE FOLDER FROM HELPLINK INSTALLDATE NAME
                         NO_REMOVE RELEASE_TYPE PUBLISHER UNINSTALL_STRING 
                         URL_INFO_ABOUT VERSION VERSION_MINOR VERSION_MAJOR 
-                        GUID RELEASETYPE ARCH/ ],
+                        GUID ARCH/ ],
     SOUNDS      => [ qw/CAPTION DESCRIPTION MANUFACTURER NAME/ ],
     STORAGES    => [ qw/DESCRIPTION DISKSIZE INTERFACE MANUFACTURER MODEL NAME
                         TYPE SERIAL SERIALNUMBER FIRMWARE SCSI_COID SCSI_CHID