From c5b54a19f3ab7b9df26ace326eb9467b040b3fd2 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Sun, 24 Jan 2010 10:46:54 -0500 Subject: [PATCH] Revert "Merge branch '1.9-release'" This reverts commit 6181a4ee3ca80c17de637e31313ef8f5281d8388, reversing changes made to 398bbc01c20af347572a0e7d9bdd0a51ef38899a. --- index.php | 6 +- test/fixtures/destroy-widgets.inc | 3 - test/selenium/TestWidgetInitIsCorrect.html | 65 ---------------------- widgets/BookmarkWidget.inc | 7 ++- 4 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 test/fixtures/destroy-widgets.inc delete mode 100644 test/selenium/TestWidgetInitIsCorrect.html diff --git a/index.php b/index.php index 5d7c4ad..2a9a36b 100644 --- a/index.php +++ b/index.php @@ -12,13 +12,13 @@ comicpress_display_post(); endwhile; } - Restore(); - UnProtect(); + Restore(); + UnProtect(); wp_reset_query(); ?> - diff --git a/test/fixtures/destroy-widgets.inc b/test/fixtures/destroy-widgets.inc deleted file mode 100644 index 228d5f6..0000000 --- a/test/fixtures/destroy-widgets.inc +++ /dev/null @@ -1,3 +0,0 @@ -option('sidebars_widgets', array()); diff --git a/test/selenium/TestWidgetInitIsCorrect.html b/test/selenium/TestWidgetInitIsCorrect.html deleted file mode 100644 index 35803f1..0000000 --- a/test/selenium/TestWidgetInitIsCorrect.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - -TestWidgetInitIsCorrect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TestWidgetInitIsCorrect
open/wp-admin/
clickAndWaitlink=Post Fixtures
clicklink=themes/comicpress-2.8/test/fixtures/destroy-widgets.inc
clickpf[is_ok]
clickAndWait//input[@value='Load Provided Data']
assertTextPresentNew data set loaded into WordPress.
clickAndWaitsite-visit-button
assertElementNotPresent//script[contains(text(), 'var image_root')]
open/wp-admin/
- - diff --git a/widgets/BookmarkWidget.inc b/widgets/BookmarkWidget.inc index 9ca4a25..5327d6f 100644 --- a/widgets/BookmarkWidget.inc +++ b/widgets/BookmarkWidget.inc @@ -45,11 +45,12 @@ class ComicPressBookmarkWidget extends WP_Widget { ); } - function init() {} + function init() { + add_action('wp_head', array(&$this, 'wp_head')); + } function is_active() { - add_action('wp_head', array(&$this, 'wp_head')); - add_action('template_redirect', array(&$this, 'template_redirect')); + add_action('template_redirect', array(&$this, 'template_redirect')); } function template_redirect() {