[Customisation Database Commits] r1137 - in /branches/stable: ./ titania/includes/functions_install.php titania/install.php

[Nathan Guse]

Author: exreaction
Date: Tue Apr 27 05:00:13 2010
New Revision: 1137

Log:
Merge to stable

Modified:
    branches/stable/   (props changed)
    branches/stable/titania/includes/functions_install.php
    branches/stable/titania/install.php

Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Tue Apr 27 05:00:13 2010
***************
*** 1 ****
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134
--- 1 ----
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136

Modified: branches/stable/titania/includes/functions_install.php
==============================================================================
*** branches/stable/titania/includes/functions_install.php (original)
--- branches/stable/titania/includes/functions_install.php Tue Apr 27 05:00:13 2010
***************
*** 185,190 ****
--- 185,194 ----
  {
  	global $umil;
  
+ 	// Empty the categories table first
+ 	$sql = 'DELETE FROM ' . TITANIA_CATEGORIES_TABLE;
+ 	phpbb::$db->sql_query($sql);
+ 
  	$categories = array(
  		array(
  			'category_id'	=> 1,

Modified: branches/stable/titania/install.php
==============================================================================
*** branches/stable/titania/install.php (original)
--- branches/stable/titania/install.php Tue Apr 27 05:00:13 2010
***************
*** 582,588 ****
  			array('titania_num_contribs', 0, true),
  		),
  
! 		'custom' => 'titania_custom',
  
  		'cache_purge' => '',
  	),
--- 582,588 ----
  			array('titania_num_contribs', 0, true),
  		),
  
! 		'custom' => array('titania_tags', 'titania_categories'),
  
  		'cache_purge' => '',
  	),