From: Marcus Boerger <helly@php.net>
Date: Sat, 3 Mar 2007 14:46:44 +0000 (+0000)
Subject: # This block got lost somehow
X-Git-Tag: RELEASE_1_0_1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=394bd0b8d31654a3f01a179114b2b98c46f5a603;p=php

# This block got lost somehow
---

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 6ef0bdc8a2..00da33b936 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -675,6 +675,18 @@ SPL_METHOD(SplFileInfo, getBasename)
 		}
 	}
 
+	if (intern->path_len && intern->path_len < intern->file_name_len) {
+		if (intern->file_name_type == IS_UNICODE) {
+			fname.u = intern->file_name.u + intern->path_len + 1;
+		} else {
+			fname.s = intern->file_name.s + intern->path_len + 1;
+		}
+		flen = intern->file_name_len - (intern->path_len + 1);
+	} else {
+		fname = intern->file_name;
+		flen = intern->file_name_len;
+	}
+
 	if (intern->file_name_type == IS_UNICODE) {	
 		php_u_basename(fname.u, flen, suffix.u, slen, &fname.u, &flen TSRMLS_CC);
 	} else {