Merge pull request #3270 from 810/develop

Release Kunena 4.0.2
Kunena · Jun 26, 2015 · fad9712 · fad9712
2 parents ecf0729 + fef3bf9
commit fad9712
Show file tree

Hide file tree

Showing 387 changed files with 34,775 additions and 11,017 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ In addition we recommend the following PHP settings:
     memory_limit           >= 32M  (>= 64M recommended) - depends on other Joomla extensions used
     safe_mode               = off
     upload_max_filesize    >= 3M
-    GD, DOM, JSON support installed
+    GD, DOM, JSON, FINFO support installed and OpenSSL only to embedded tweets
 
 *Kunena* requires the following Joomla settings:
 

diff --git a/build/build.xml b/build/build.xml
@@ -107,9 +107,6 @@
 		<copy todir="${tmp_dir}/packages/lib_kunena" overwrite="true">
 			<fileset dir="${project_dir}/libraries/kunena"/>
 		</copy>
-        <copy todir="${tmp_dir}/packages/plg_content_kunena" overwrite="true">
-            <fileset dir="${project_dir}/plugins/plg_content_kunena"/>
-        </copy>
 		<copy todir="${tmp_dir}/packages/plg_system_kunena" overwrite="true">
 			<fileset dir="${project_dir}/plugins/plg_system_kunena"/>
 		</copy>
@@ -147,11 +144,6 @@
 				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
-        <copy todir="${tmp_dir}/packages/plg_content_kunena" overwrite="true" filtering="true">
-            <fileset dir="${project_dir}/plugins/plg_content_kunena">
-                <include name="**/*.xml"/>
-            </fileset>
-        </copy>
 		<copy todir="${tmp_dir}/packages/plg_system_kunena" overwrite="true" filtering="true">
 			<fileset dir="${project_dir}/plugins/plg_system_kunena">
 				<include name="**/*.xml"/>
@@ -202,22 +194,22 @@
 
 		<!-- Readme -->
 		<copy file="${project_dir}/README.md" tofile="${package_dir}/README.txt" overwrite="true" filtering="true" />
-		
+
 		<!-- Put template crypsis boostrap 3 in his own package -->
 		<copy todir="${tmp_dir}/crypsisb3" overwrite="true">
 			<fileset dir="${project_dir}/${kunena.site}/template/crypsisb3">
 				<exclude name="**/*.md"/>
 			</fileset>
 		</copy>
-		
+
 		<copy file="${project_dir}/${kunena.site}/template/crypsisb3/README.md" tofile="${tmp_dir}/crypsisb3/README.txt" overwrite="true" filtering="true" />
-		
+
 		<copy todir="${tmp_dir}/crypsisb3" overwrite="true" filtering="true">
 			<fileset dir="${project_dir}/${kunena.site}/template/crypsisb3">
 				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
-			
+
 		<delete dir="${tmp_dir}/packages/com_kunena/site/template/crypsisb3" />
 	</target>
 
@@ -361,7 +353,6 @@
 		<language tag="zh-TW" />
 
 		<archive destfile="${build_dir}/packages/plg_system_kunena${str.version}" basedir="${tmp_dir}/packages/plg_system_kunena" />
-		<archive destfile="${build_dir}/packages/plg_content_kunena${str.version}" basedir="${tmp_dir}/packages/plg_content_kunena" />
 		<archive destfile="${build_dir}/packages/plg_quickicon_kunena${str.version}" basedir="${tmp_dir}/packages/plg_quickicon_kunena" />
 		<archive destfile="${build_dir}/packages/lib_kunena${str.version}" basedir="${tmp_dir}/packages/lib_kunena" />
 		<archive destfile="${build_dir}/packages/com_kunena${str.version}" basedir="${tmp_dir}/packages/com_kunena" />

diff --git a/components/com_kunena/admin/install/install.script.php b/components/com_kunena/admin/install/install.script.php
@@ -25,16 +25,13 @@ class Com_KunenaInstallerScript
 			'0'   => '5.5' // Preferred version
 		),
 		'Joomla!' => array(
-			'3.4' => '3.4.0',
+			'3.4' => '3.4.1',
 			'3.3' => '3.3.6',
-			'3.2' => '3.2.7',
-			'3.1' => '3.1.5',
-			'3.0' => '3.0.4',
 			'2.5' => '2.5.28',
-			'0'   => '3.3.6' // Preferred version
+			'0'   => '3.4.1' // Preferred version
 		)
 	);
-	protected $extensions = array('dom', 'gd', 'json', 'pcre', 'SimpleXML');
+	protected $extensions = array('dom', 'gd', 'fileinfo', 'json', 'pcre', 'SimpleXML');
 
 	public function install($parent)
 	{

diff --git a/components/com_kunena/admin/install/install.xml b/components/com_kunena/admin/install/install.xml
@@ -137,7 +137,7 @@
 		       type="varchar(255)"
 		       null="0"/>
 		<field name="icon"
-		       type="varchar(20)"
+		       type="varchar(60)"
 		       null="0"/>
 		<field name="icon_id"
 		       type="tinyint(4)"

diff --git a/components/com_kunena/admin/install/kunena.install.upgrade.xml b/components/com_kunena/admin/install/kunena.install.upgrade.xml
@@ -655,6 +655,12 @@
 				DEFAULT '' AFTER `topic_ordering`
 			</query>
 		</version>
+		<version version="4.0.2-DEV2"
+		         versiondate="2015-06-18"
+		         versionname="Internal">
+			<query mode="silenterror">ALTER TABLE `#__kunena_categories`
+				CHANGE COLUMN `icon` `icon` VARCHAR(60)</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
@@ -165,6 +165,7 @@ CREATE TABLE IF NOT EXISTS `#__kunena_categories` (
 	`parent_id` int(11) NULL default '0',
 	`name` tinytext NULL,
 	`alias` varchar(255) NOT NULL,
+	`icon` varchar(60) NOT NULL default '',
 	`icon_id` tinyint(4) NOT NULL default '0',
 	`locked` tinyint(4) NOT NULL default '0',
 	`accesstype` varchar(20) NOT NULL default 'joomla.level',

diff --git a/components/com_kunena/admin/install/sql/updates/mysql/4.0.2-2015-06-18.sql b/components/com_kunena/admin/install/sql/updates/mysql/4.0.2-2015-06-18.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__kunena_categories` CHANGE COLUMN `icon` `icon` VARCHAR(60)