Merge branch 'dev' into 729-move_data

1 files changed, 24 insertions, 0 deletions

diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 2c2682041..cc60a1607 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -332,3 +332,27 @@ function check_install_database() {
 
 	return $status;
 }
+
+/**
+ * Remove a directory recursively.
+ *
+ * From http://php.net/rmdir#110489
+ *
+ * @param $dir the directory to remove
+ */
+function recursive_unlink($dir) {
+	if (!is_dir($dir)) {
+		return true;
+	}
+	$files = array_diff(scandir($dir), array('.', '..'));
+	foreach ($files as $filename) {
+		$filename = $dir . '/' . $filename;
+		if (is_dir($filename)) {
+			@chmod($filename, 0777);
+			recursive_unlink($filename);
+		} else {
+			unlink($filename);
+		}
+	}
+	return rmdir($dir);
+}