From 02f629f8d682e117ad790a28435701c4c1bfe4e9 Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Mon, 2 Sep 2013 14:40:03 -0400
Subject: [PATCH] BUG NNNNN "No se elimina el directorio a eliminar" SOLVED

- Al tratar de eliminar un directorio, se elimina el contenido,
  pero no asi el directorio
- Problema resuelto, se ha cambiado el orden de la eliminacion
  del directorio
---
 gulliver/system/class.g.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 7fbff3ce9..7a9601e74 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -340,21 +340,22 @@ class G
                 if ($file == $dirName . '/.' || $file == $dirName . '/..') {
                     continue;
                 }
+
                 if (is_dir( $file )) {
                     G::rm_dir( $file );
-
-                    if (strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN') {
-                        $dirNameWin = str_replace( '/', '\\', $dirName );
-                        exec( 'DEL /F /S /Q ' . $dirNameWin . '', $res );
-                        exec( 'RD /S /Q ' . $dirNameWin . '', $res );
-                    } else {
-                        @rmdir( $file );
-                    }
-
                 } else {
                     @unlink( $file );
                 }
             }
+
+            if (strtoupper(substr(PHP_OS, 0, 3)) === "WIN") {
+                $dirName = str_replace("/", "\\", $dirName);
+
+                exec("DEL /F /S /Q " . $dirName . "", $res);
+                exec("RD /S /Q " . $dirName . "", $res);
+            } else {
+                @rmdir($dirName);
+            }
         } else {
             @unlink( $dirName );
         }