Commit 36b74959 authored Jun 05, 2011 by Stuart Clark

#1178034: Fixed issue with file_check_directory() system messages.

parent 1aed72ae

CHANGELOG.txt

+6 −0

Changes for CHANGELOG.txt: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		SexyBookmarks 6.x-2.x-dev, xxxx-xx-xx (development release)
		--------------------------------------------------------------------------------

		- #1178034: Fixed issue with file_check_directory() system messages.


		SexyBookmarks 6.x-2.0, 2011-05-30
		--------------------------------------------------------------------------------

		- Initial backport for Drupal 7.x-2.x branch.

sexybookmarks.module

+8 −0

Changes for sexybookmarks.module: 8 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -195,9 +195,17 @@ function sexybookmarks_get_file($url, $destination = NULL) {
		$request = drupal_http_request($url);
		$pathinfo = pathinfo($file);
		if ($request->code == 200) {
		// Stash messages to suppress file_check_directory() messages.
		$messages = drupal_get_messages(NULL, FALSE);

		if (file_check_directory($dir = file_directory_path() . '/sexybookmarks', FILE_CREATE_DIRECTORY) && file_check_directory($pathinfo['dirname'], FILE_CREATE_DIRECTORY)) {
		file_save_data($request->data, $file);
		}

		// Restore messages to suppress file_check_directory() messages.
		if (!user_access('administer sexybookmarks')) {
		$_SESSION['messages'] = $messages;
		}
		}

		else {