- joined v3.1.4 with head

sql/postgresql/wiki-drop.sql

+-- 
+-- @author Frank Bergmann (frank.bergmann@project-open.com)
+-- @creation-date 2005-08-06
+-- @arch-tag: 0d6b6723-0e95-4c00-8a84-cb79b4ad3f9d
+-- @cvs-id $Id$
+--
+
+
+
+----------------------------------------------------
+-- Folders and FolderTypeMap
+
+
+delete from cr_folder_type_map
+where folder_id in (
+	select folder_id
+	from cr_folders
+	where package_id in (
+		select package_id
+		from apm_packages
+		where package_key = 'wiki'
+	)
+)
+
+
+delete from cr_folders
+where package_id in (
+	select package_id
+	from apm_packages
+	where package_key = 'wiki'
+);
+
+
+
+----------------------------------------------------
+-- x-openacs-wiki
+
+delete from cr_item_rels
+where item_id in (
+	select item_id
+	from cr_items
+	where live_revision in (
+			select revision_id
+			from cr_revisions
+			where mime_type = 'text/x-openacs-wiki'
+		) or latest_revision in (
+			select revision_id
+			from cr_revisions
+			where mime_type = 'text/x-openacs-wiki'
+		)
+	)
+;
+
+delete from cr_items
+where live_revision in (
+		select revision_id
+		from cr_revisions
+		where mime_type = 'text/x-openacs-wiki'
+	) 
+	or latest_revision in (
+		select revision_id
+		from cr_revisions
+		where mime_type = 'text/x-openacs-wiki'
+	)
+;
+
+
+delete from cr_revisions
+where mime_type = 'text/x-openacs-wiki'
+;
+
+delete from cr_mime_types
+where label = 'Text - Wiki'
+;
+
+
+----------------------------------------------------
+-- x-openacs-markdown
+
+delete from cr_item_rels
+where item_id in (
+	select item_id
+	from cr_items
+	where live_revision in (
+			select revision_id
+			from cr_revisions
+			where mime_type = 'text/x-openacs-markdown'
+		) or latest_revision in (
+			select revision_id
+			from cr_revisions
+			where mime_type = 'text/x-openacs-markdown'
+		)
+	)
+;
+
+delete from cr_items
+where live_revision in (
+		select revision_id
+		from cr_revisions
+		where mime_type = 'text/x-openacs-markdown'
+	) 
+	or latest_revision in (
+		select revision_id
+		from cr_revisions
+		where mime_type = 'text/x-openacs-markdown'
+	)
+;
+
+
+delete from cr_revisions
+where mime_type = 'text/x-openacs-markdown'
+;
+
+delete from cr_mime_types
+where label = 'Text - Markdown'
+;
+
+
+
+----------------------------------------------------
+-- Package & folders
+
+
+
+-- delete from acs_object_context_index
+-- where object_id = 12515
+-- 	or ancestor_id = 12515
+-- ;
+
+
+-- delete from acs_objects
+-- where context_id = 12515;
+

wiki.info

@@ -16,6 +16,7 @@
         <provides url="wiki" version="0.2d"/>
         <requires url="acs-kernel" version="5.1.4"/>
         <requires url="cms" version="4.1.1"/>
+        <requires url="search" version="5.1.4"/>
 
         <callbacks>
             <callback type="after-install"  proc="wiki::install::package_install"/>

www/master.adp

@@ -216,7 +216,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
                 <td valign="top" class="small">
 		  <a href="http://www.project-open.com/" class="right">
 		    Powered by <br>
-		    <span class=brandfirst>Project/</span><span class=brandsec>Open</span>
+<span class=brandsec>&#93;</span><span class=brandfirst>project-open</span><span class=brandsec>&#91;</span>
 		  </a>
 	 	</td>
               </tr>
@@ -285,10 +285,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 				   </tr>
 				  <tr align="right">
 					
-                <td align=left>&copy; 2003 - 2005 with the respective authors
-
-<!-- <img width=1 height=1 src="http://www.projop.com:30016/intranet-crm-tracking/download/spacer.gif?source=projop"> -->
-                </td>
+                <td align=left>&copy; 2003 - 2005 with the respective authors</td>
 				  </tr>
 				</table>
 			</td></tr>