From 0856a97663d7ca3458d3a4a9fec8e6f075045752 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 28 Jun 2011 01:32:05 +1000 Subject: [PATCH] Fix for admin block bug --- includes/block.inc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/block.inc b/includes/block.inc index ca3fef9..a6b98bc 100644 --- a/includes/block.inc +++ b/includes/block.inc @@ -75,7 +75,8 @@ function sexybookmarks_block_view($delta) { function sexybookmarks_block_current_view() { $profile = variable_get('sexybookmarks_block_current_profile', 'default'); - if (!empty($profile)) { + $url = request_uri(); + if (!empty($profile) && !stristr($url, 'admin/settings/sexybookmarks')) { return array( 'subject' => t('SexyBookmarks'), 'content' => theme('sexybookmarks', array( @@ -88,7 +89,8 @@ function sexybookmarks_block_current_view() { function sexybookmarks_block_site_view() { $profile = variable_get('sexybookmarks_block_site_profile', 'default'); - if (!empty($profile)) { + $url = request_uri(); + if (!empty($profile) && !stristr($url, 'admin/settings/sexybookmarks')) { return array( 'subject' => t('SexyBookmarks'), 'content' => theme('sexybookmarks', array( -- 1.7.4.msysgit.0