diff -crB views_attachment_block/views_attachment_block.info views_attachment_block_d7/views_attachment_block.info
*** views_attachment_block/views_attachment_block.info	2010-05-18 15:25:11.000000000 +0300
--- views_attachment_block_d7/views_attachment_block.info	2011-05-23 08:29:37.000000000 +0300
***************
*** 1,12 ****
- ; $Id: views_attachment_block.info,v 1.2 2010/05/17 12:29:49 darthsteven Exp $
  name = Views Attachment Block
  description = "Allows views attachments to be shown in blocks on a page"
  package = Views
! core = 6.x
! 
! ; Information added by drupal.org packaging script on 2010-05-18
! version = "6.x-1.2"
! core = "6.x"
! project = "views_attachment_block"
! datestamp = "1274185511"
! 
--- 1,5 ----
  name = Views Attachment Block
  description = "Allows views attachments to be shown in blocks on a page"
  package = Views
! core = 7.x
! files[] = views_attachment_block_plugin_display_block_attachment.inc
\ No newline at end of file
diff -crB views_attachment_block/views_attachment_block.module views_attachment_block_d7/views_attachment_block.module
*** views_attachment_block/views_attachment_block.module	2010-05-17 15:29:49.000000000 +0300
--- views_attachment_block_d7/views_attachment_block.module	2011-05-27 08:06:27.000000000 +0300
***************
*** 1,7 ****
  <?php
  
- // $Id: views_attachment_block.module,v 1.2 2010/05/17 12:29:49 darthsteven Exp $
- 
  /**
   * Implementation of hook_views_api().
   */
--- 1,5 ----
diff -crB views_attachment_block/views_attachment_block_plugin_display_block_attachment.inc views_attachment_block_d7/views_attachment_block_plugin_display_block_attachment.inc
*** views_attachment_block/views_attachment_block_plugin_display_block_attachment.inc	2010-05-18 14:06:49.000000000 +0300
--- views_attachment_block_d7/views_attachment_block_plugin_display_block_attachment.inc	2011-05-27 08:09:41.000000000 +0300
***************
*** 1,7 ****
  <?php
  
- // $Id: views_attachment_block_plugin_display_block_attachment.inc,v 1.3 2010/05/18 11:06:49 darthsteven Exp $
- 
  
  /**
   * @file
--- 1,5 ----
***************
*** 99,119 ****
     * but extended block handlers might be able to do interesting
     * stuff with it.
     */
!   function execute_hook_block($op = 'list', $delta = 0, $edit = array()) {
!     if ($op == 'list') {
!       $delta = $this->view->name . '-' . $this->display->id;
!       $desc = $this->get_option('block_description');
! 
!       if (empty($desc)) {
!         $desc = t('@view: @display', array('@view' => $this->view->name, '@display' => $this->display->display_title));
!       }
!       return array(
!         $delta => array(
!           'info' => $desc,
!           'cache' => BLOCK_NO_CACHE,
!         )
!       );
!     }
    }
  
    /**
--- 97,115 ----
     * but extended block handlers might be able to do interesting
     * stuff with it.
     */
!   function execute_hook_block_list($delta = 0, $edit = array()) {
!     $delta = $this->view->name . '-' . $this->display->id;
!     $desc = $this->get_option('block_description');
! 
!     if (empty($desc)) {
!       $desc = t('@view: @display', array('@view' => $this->view->name, '@display' => $this->display->display_title));
!     }
!     return array(
!       $delta => array(
!         'info' => $desc,
!         'cache' => BLOCK_NO_CACHE,
!       )
!     );
    }
  
    /**
***************
*** 129,135 ****
      else {
        $view = views_get_page_view();
        if (is_object($view)) {
!         $content = $view->view->build_info['blocks_attached'][$this->display->id];
          // This is a hook_block implementation calling:
          // Prior to this being called, the $view should already be set to this
          // display, and arguments should be set on the view.
--- 125,131 ----
      else {
        $view = views_get_page_view();
        if (is_object($view)) {
!         $content = $view->build_info['blocks_attached'][$this->display->id];
          // This is a hook_block implementation calling:
          // Prior to this being called, the $view should already be set to this
          // display, and arguments should be set on the view.
***************
*** 210,213 ****
      // fall-through returns NULL
    }
  
! }
--- 206,209 ----
      // fall-through returns NULL
    }
  
! }
\ No newline at end of file
diff -crB views_attachment_block/views_attachment_block.views.inc views_attachment_block_d7/views_attachment_block.views.inc
*** views_attachment_block/views_attachment_block.views.inc	2010-05-17 15:29:49.000000000 +0300
--- views_attachment_block_d7/views_attachment_block.views.inc	2011-05-23 08:31:52.000000000 +0300
***************
*** 1,7 ****
  <?php
  
- // $Id: views_attachment_block.views.inc,v 1.2 2010/05/17 12:29:49 darthsteven Exp $
- 
  /**
   * Implementation of hook_views_plugins().
   */
--- 1,5 ----