From 385fb92479376f9a6d5a947a96d061cbb1720296 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Mon, 11 Dec 2006 06:27:52 +0000
Subject: [PATCH] Haha... we're both wrong.  I just remembered a conversation I
 had with JT... this was right from the beginning.  He intended the Wiki
 wobject to be a wobject only and to add pages using the link in the
 wobject... I just thought I understood him wrong when I could see no way to
 add a page, which I subsequently found on the search screen.

Rolling this back.
---
 docs/changelog/7.x.x.txt             | 1 -
 docs/upgrades/upgrade_7.3.0-7.3.1.pl | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f4392c550..2c0fe1d91 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,7 +12,6 @@
    Activities and tests.
    Added tests for File and Image assets to verify that this happens correctly.
  - fix - Unable to add EventsCalendar
- - fix - Wiki Page not added to config
  - fix - Some functions in InOutBoard not internationalized
 
 
diff --git a/docs/upgrades/upgrade_7.3.0-7.3.1.pl b/docs/upgrades/upgrade_7.3.0-7.3.1.pl
index 117e28be4..c02c4d9c1 100644
--- a/docs/upgrades/upgrade_7.3.0-7.3.1.pl
+++ b/docs/upgrades/upgrade_7.3.0-7.3.1.pl
@@ -21,16 +21,9 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 cleanupEventsCalendar($session);
-addWikiMaster($session);
 
 finish($session); # this line required
 
-#-------------------------------------------------
-sub addWikiMaster {
-	my $session = shift;
-	$session->config->addToArray("assetContainers","WebGUI::Asset::Wobject::WikiMaster");
-}
-
 #-------------------------------------------------
 sub cleanupEventsCalendar {
 	my $session = shift;