Set iconset on default dir, when empty

Kunena · Oct 16, 2015 · 68c717a · 68c717a
1 parent cde41b8
commit 68c717a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/components/com_kunena/admin/install/install.xml b/components/com_kunena/admin/install/install.xml
@@ -226,7 +226,7 @@
 		<field name="iconset"
 		       type="varchar(255)"
 		       null="0"
-		       default=""/>
+		       default="default"/>
 		<field name="numTopics"
 		       type="mediumint(8)"
 		       null="0"

diff --git a/components/com_kunena/admin/install/kunena.install.upgrade.xml b/components/com_kunena/admin/install/kunena.install.upgrade.xml
@@ -666,6 +666,12 @@
 		         versionname="Internal">
 			<query mode="silenterror">ALTER TABLE `#__kunena_users` CHANGE COLUMN `canSubscribe` `canSubscribe` tinyint(1) NOT NULL default '-1'</query>
 		</version>
+		<version version="4.0.7-DEV2"
+		         versiondate="2015-10-16"
+		         versionname="Internal">
+			<query mode="silenterror">ALTER TABLE `#__kunena_categories` CHANGE COLUMN `iconset` `iconset` varchar(255) NOT NULL default 'default'</query>
+			<query mode="silenterror">UPDATE `#__kunena_categories` SET iconset='default' WHERE iconset=''</query>
+		</version>
 		<version version="@kunenaversion@"
 		         versiondate="@kunenaversiondate@"
 		         versionname="@kunenaversionname@">

diff --git a/components/com_kunena/admin/install/sql/install/mysql/create_tables.utf8.sql b/components/com_kunena/admin/install/sql/install/mysql/create_tables.utf8.sql
@@ -188,6 +188,7 @@ CREATE TABLE IF NOT EXISTS `#__kunena_categories` (
 	`class_sfx` varchar(20) NOT NULL,
 	`allow_polls` tinyint(4) NOT NULL default '0',
 	`topic_ordering` varchar(16) NOT NULL default 'lastpost',
+	`iconset` varchar(255) NOT NULL default 'default',
 	`numTopics` mediumint(8) NOT NULL default '0',
 	`numPosts` mediumint(8) NOT NULL default '0',
 	`last_topic_id` int(11) NOT NULL default '0',

diff --git a/components/com_kunena/admin/install/sql/updates/mysql/4.0.7-2015-10-16.sql b/components/com_kunena/admin/install/sql/updates/mysql/4.0.7-2015-10-16.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__kunena_categories` CHANGE COLUMN `iconset` `iconset` varchar(255) NOT NULL default 'default';
+UPDATE `#__kunena_categories` SET iconset='default' WHERE iconset='';
diff --git a/pkg_kunena.xml b/pkg_kunena.xml
@@ -3,7 +3,7 @@
 <extension type="package" version="2.5" method="upgrade">
 	<name>Kunena Forum Package</name>
 	<packagename>kunena</packagename>
-	<version>4.0.7-DEV</version>
+	<version>4.0.7-DEV2</version>
 	<versionname>Internal</versionname>
 	<creationDate>@kunenaversiondate@</creationDate>
 	<author>Kunena Team</author>