]> granicus.if.org Git - php/commitdiff
re-enable disabled cwd code
authorGreg Beaver <cellog@php.net>
Tue, 22 Apr 2008 17:19:06 +0000 (17:19 +0000)
committerGreg Beaver <cellog@php.net>
Tue, 22 Apr 2008 17:19:06 +0000 (17:19 +0000)
ext/phar/phar_object.c

index 27b92a5968ae4be0b714839e20b6fb617b3fa2e2..eacf4e9c956e17c4736b49090353b9569799879e 100755 (executable)
@@ -273,7 +273,7 @@ static int phar_file_action(phar_entry_data *phar, char *mime_type, int code, ch
                        PHAR_G(cwd) = NULL;
                        PHAR_G(cwd_len) = 0;
                        if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
-                               if (0 && (cwd = strrchr(entry, '/'))) {
+                               if ((cwd = strrchr(entry, '/'))) {
                                        if (entry == cwd) {
                                                /* root directory */
                                                PHAR_G(cwd_len) = 0;