Merge branch 'master' of github.com:bitweaver/kernel

1 files changed, 4 insertions, 28 deletions

diff --git a/kernel_lib.php b/kernel_lib.php
index ff41e00..896411b 100644
--- a/kernel_lib.php
+++ b/kernel_lib.php
@@ -162,33 +162,9 @@ function mkdir_p( $pTarget, $pPerms = 0755 ) {
 	}
 
 	$oldu = umask( 0 );
-	// make use of PHP5 recursive mkdir feature
-	// php5_+ only NOW! if( version_compare( phpversion(), "5.0.0", ">=" )) {
-		mkdir( $pTarget, $pPerms, TRUE );
-		umask( $oldu );
-		return TRUE;
-	/* PHP 5+ only now
-	} else {
-		if( @mkdir( $pTarget, $pPerms )) {
-			bitdebug( "mkdir_p() - creating $pTarget" );
-			umask( $oldu );
-			return TRUE;
-		} else {
-			umask( $oldu );
-			$parent = substr( $pTarget, 0, ( strrpos( $pTarget, '/' )));
-
-			// recursively create parents
-			if( mkdir_p( $parent, $pPerms )) {
-				// make the actual target!
-				if( @mkdir( $pTarget, $pPerms )) {
-					return TRUE;
-				} elseif( !is_dir( $pTarget ) ) {
-					error_log( "mkdir() - could not create $pTarget" );
-				}
-			}
-		}
-	}
-	*/
+	@mkdir( $pTarget, $pPerms, TRUE );
+	umask( $oldu );
+	return TRUE;
 }
 
 /**
@@ -504,7 +480,7 @@ function unlink_r( $pPath, $pFollowLinks = FALSE ) {
 		if( $dir = opendir( $pPath ) ) {
 			while( FALSE !== ( $entry = readdir( $dir ) ) ) {
 				if( is_file( "$pPath/$entry" ) || ( !$pFollowLinks && is_link( "$pPath/$entry" ) ) ) {
-					unlink( "$pPath/$entry" );
+					@unlink( "$pPath/$entry" );
 				} elseif( is_dir( "$pPath/$entry" ) && $entry != '.' && $entry != '..' ) {
 					unlink_r( "$pPath/$entry" ) ;
 				}