[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13402] branches/1.10/lib

[<lph...@us...>]

Revision: 13402
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13402&view=rev
Author:   lphuberdeau
Date:     2008-07-01 07:32:08 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
[MOD] Correct listing of category items created by profiles

Modified Paths:
--------------
    branches/1.10/lib/categories/categlib.php
    branches/1.10/lib/profilelib/installlib.php

Modified: branches/1.10/lib/categories/categlib.php
===================================================================
--- branches/1.10/lib/categories/categlib.php	2008-07-01 14:18:43 UTC (rev 13401)
+++ branches/1.10/lib/categories/categlib.php	2008-07-01 14:32:08 UTC (rev 13402)
@@ -599,6 +599,42 @@
 	}
 
 	// FUNCTIONS TO CATEGORIZE SPECIFIC OBJECTS ////
+	function categorize_any( $type, $identifier, $categId )
+	{
+		switch( $type )
+		{
+		case 'wiki page':
+		case 'wikipage':
+		case 'wiki_page':
+			return $this->categorize_page( $identifier, $categId );
+		case 'tracker':
+			return $this->categorize_tracker( $identifier, $categId );
+		case 'quiz':
+			return $this->categorize_quiz( $identifier, $categId );
+		case 'article':
+			return $this->categorize_article( $identifier, $categId );
+		case 'faq':
+			return $this->categorize_faq( $identifier, $categId );
+		case 'blog':
+			return $this->categorize_blog( $identifier, $categId );
+		case 'directory':
+			return $this->categorize_directory( $identifier, $categId );
+		case 'gallery':
+		case 'gal':
+			return $this->categorize_gallery( $identifier, $categId );
+		case 'file_gallery':
+		case 'file gallery':
+		case 'fgal':
+			return $this->categorize_file_gallery( $identifier, $categId );
+		case 'forum':
+			return $this->categorize_forum( $identifier, $categId );
+		case 'poll':
+			return $this->categorize_poll( $identifier, $categId );
+		case 'calendar':
+			return $this->categorize_calendar( $identifier, $categId );
+		}
+	}
+
 	function categorize_page($pageName, $categId) {
 		// Check if we already have this object in the tiki_categorized_objects page
 

Modified: branches/1.10/lib/profilelib/installlib.php
===================================================================
--- branches/1.10/lib/profilelib/installlib.php	2008-07-01 14:18:43 UTC (rev 13401)
+++ branches/1.10/lib/profilelib/installlib.php	2008-07-01 14:32:08 UTC (rev 13402)
@@ -643,10 +643,7 @@
 		{
 			list( $type, $object ) = $item;
 
-			if (!($catObjectId = $categlib->is_categorized($type, $object))) {
-				$catObjectId = $categlib->add_categorized_object($type, $object, '', '', '');
-			}
-			$categlib->categorize($catObjectId, $id);
+			$categlib->categorize_any( $type, $object, $id );
 		}
 
 		return $id;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.