Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

.travis.yml

@@ -103,7 +103,7 @@ before_install:
 
 # Install composer dev libs
 install:
-  - travis_retry composer install --optimize-autoloader
+  - travis_retry composer install --optimize-autoloader --no-progress
 
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:

include/message.php

@@ -210,8 +210,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		intval($channel['channel_id']),
 		dbesc($channel['channel_hash']),
 		dbesc($recipient),
-		dbesc($subject),
 		dbesc(($mimetype)? $mimetype : 'text/bbcode'),
+		dbesc($subject),
 		dbesc($body),
 		dbesc($sig),
 		dbesc($jattach),

install/schema_postgres.sql

@@ -712,7 +712,7 @@ CREATE TABLE "mail" (
   "to_xchan" text NOT NULL DEFAULT '',
   "account_id" bigint  NOT NULL DEFAULT '0',
   "channel_id" bigint  NOT NULL DEFAULT '0',
-  "mail_mimetype char(64) NOT NULL DEFAULT '0',
+  "mail_mimetype" char(64) NOT NULL DEFAULT '0',
   "title" text NOT NULL,
   "body" text NOT NULL,
   "sig" text NOT NULL,

tests/travis/prepare_mysql.sh

@@ -36,4 +36,13 @@ mysql -e "SHOW VARIABLES LIKE 'character_set%';"
 mysql -e "SELECT @@sql_mode;"
 
 # Create Hubzilla database
-mysql -e "CREATE DATABASE IF NOT EXISTS hubzilla;" -uroot;
+mysql -u root -e "CREATE DATABASE IF NOT EXISTS hubzilla;";
+mysql -u root -e "CREATE USER 'hubzilla'@'localhost' IDENTIFIED BY 'hubzilla';"
+mysql -u root -e "GRANT ALL ON hubzilla.* TO 'hubzilla'@'localhost';"
+
+# Import table structure
+mysql -u root hubzilla < ./install/schema_mysql.sql
+
+# Show databases and tables
+mysql -u root -e "SHOW DATABASES;"
+mysql -u root -e "USE hubzilla; SHOW TABLES;"

tests/travis/prepare_pgsql.sh

@@ -30,8 +30,15 @@ echo "Preparing for PostgreSQL ..."
 # Print out some PostgreSQL information
 psql --version
 # Why does this hang further execution of the job?
-psql -c "SELECT VERSION();" -U postgres
+psql -U postgres -c "SELECT VERSION();"
 
 # Create Hubzilla database
-psql -c "DROP DATABASE IF EXISTS hubzilla;" -U postgres
-psql -c "CREATE DATABASE hubzilla;" -U postgres
+psql -U postgres -c "DROP DATABASE IF EXISTS hubzilla;"
+psql -U postgres -c "CREATE DATABASE hubzilla;"
+
+# Import table structure
+psql -U postgres -v ON_ERROR_STOP=1 hubzilla < ./install/schema_postgres.sql
+
+# Show databases and tables
+psql -U postgres -l
+psql -U postgres -d hubzilla -c "\dt;"