aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/connections.php2
-rw-r--r--install/schema_mysql.sql12
2 files changed, 7 insertions, 7 deletions
diff --git a/include/connections.php b/include/connections.php
index 0e9f25c8f..a2bc11773 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -629,7 +629,7 @@ function get_vcard_array($vc,$id) {
'address' => $adr->getParts()
];
$last_entry = end($adrs);
- if($last_entry && $adrs[$last_entry]['address'])
+ if($last_entry && is_array($adrs[$last_entry]['address']))
array_walk($adrs[$last_entry]['address'],'array_escape_tags');
}
}
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 27ee4dda3..4de9c0917 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -36,9 +36,9 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_feed` tinyint(4) NOT NULL DEFAULT '0',
`abook_not_here` tinyint(4) NOT NULL DEFAULT '0',
`abook_profile` char(191) NOT NULL DEFAULT '',
- `abook_incl` TEXT NOT NULL DEFAULT '',
- `abook_excl` TEXT NOT NULL DEFAULT '',
- `abook_instance` TEXT NOT NULL DEFAULT '',
+ `abook_incl` TEXT NOT NULL,
+ `abook_excl` TEXT NOT NULL,
+ `abook_instance` TEXT NOT NULL,
PRIMARY KEY (`abook_id`),
KEY `abook_account` (`abook_account`),
KEY `abook_channel` (`abook_channel`),
@@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS `app` (
`app_sig` char(191) NOT NULL DEFAULT '',
`app_author` char(191) NOT NULL DEFAULT '',
`app_name` char(191) NOT NULL DEFAULT '',
- `app_desc` text NOT NULL DEFAULT '',
+ `app_desc` text NOT NULL,
`app_url` char(191) NOT NULL DEFAULT '',
`app_photo` char(191) NOT NULL DEFAULT '',
`app_version` char(191) NOT NULL DEFAULT '',
@@ -1041,7 +1041,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`photo` char(191) NOT NULL DEFAULT '',
`thumb` char(191) NOT NULL DEFAULT '',
`publish` tinyint(1) NOT NULL DEFAULT '0',
- `profile_vcard` text NOT NULL DEFAULT '',
+ `profile_vcard` text NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `guid` (`profile_guid`,`uid`),
KEY `uid` (`uid`),
@@ -1137,7 +1137,7 @@ CREATE TABLE IF NOT EXISTS `site` (
`site_type` smallint NOT NULL DEFAULT '0',
`site_project` char(191) NOT NULL DEFAULT '',
`site_version` varchar(32) NOT NULL DEFAULT '',
- `site_crypto` text NOT NULL DEFAULT '',
+ `site_crypto` text NOT NULL,
PRIMARY KEY (`site_url`),
KEY `site_flags` (`site_flags`),
KEY `site_update` (`site_update`),