[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37853] trunk

[<oev...@us...>]

Revision: 37853
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37853&view=rev
Author:   oeversetten
Date:     2011-10-01 21:19:44 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------

[FIX] moved includes to perspective_binder itself, 
      areas panel should work anyway whether category or perspectives are
      enabled or not, changed dependency to something more sane

Modified Paths:
--------------
    trunk/admin/include_areas.php
    trunk/lib/perspective_binder.php
    trunk/lib/prefs/feature.php

Modified: trunk/admin/include_areas.php
===================================================================
--- trunk/admin/include_areas.php	2011-10-01 20:59:04 UTC (rev 37852)
+++ trunk/admin/include_areas.php	2011-10-01 21:19:44 UTC (rev 37853)
@@ -12,8 +12,6 @@
 }
 
 
-require_once('lib/perspectivelib.php');
-require_once('lib/setup/categories.php');
 require_once('lib/perspective_binder.php');
 
 	// updating table tiki_areas	

Modified: trunk/lib/perspective_binder.php
===================================================================
--- trunk/lib/perspective_binder.php	2011-10-01 20:59:04 UTC (rev 37852)
+++ trunk/lib/perspective_binder.php	2011-10-01 21:19:44 UTC (rev 37853)
@@ -13,6 +13,10 @@
   exit;
 }
 
+
+require_once('lib/perspectivelib.php');
+require_once('lib/categories/categlib.php');
+
 function HandleObjectCategories($objectCategoryIds)
 {
     
@@ -91,7 +95,7 @@
 		if(count($result->fetchRow())){
 			$result = TikiDb::get()->query("UPDATE tiki_areas SET perspectives = ? WHERE categId = ?",array(serialize($item), $key));
 	}else{ 
-			$result = TikiDb::get()->query("INSERT INTO tiki_areas (categId, perspectives) VALUES(".$key.",'".serialize($item)."')", array());}
+			$result = TikiDb::get()->query("INSERT INTO tiki_areas (categId, perspectives) VALUES(?,'?')", array($key, serialize($item)));}
 		}
 	}
 	return true;

Modified: trunk/lib/prefs/feature.php
===================================================================
--- trunk/lib/prefs/feature.php	2011-10-01 20:59:04 UTC (rev 37852)
+++ trunk/lib/prefs/feature.php	2011-10-01 21:19:44 UTC (rev 37853)
@@ -38,13 +38,14 @@
 		),
 		'feature_areas' => array(
 			'name' => tra('Areas'),
-			'description' => tra('Also known as perspective binder'),
+			'description' => tra('Binding categories and perspectives to each other'),
 			'type' => 'flag',
 			'help' => 'Areas',
 			'default' => 'n',
 			'admin' => 'areas',
 			'dependencies' => array(
-				'categories_used_in_tpl',
+				'feature_categories',
+				'feature_perspective',
 			),
 		),
 		'feature_wiki' => array(

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