aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-19 11:23:38 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-19 11:23:38 +0200
commitec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4 (patch)
tree8c15ce5b6ab6de0d6c8d304084eed67c037f8811 /Zotlabs
parent71c599f50ef2933f3898d55823aec351f95d5828 (diff)
parent98bc1ed600639a8edff78795d8e71019d9dddd18 (diff)
downloadvolse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.tar.gz
volse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.tar.bz2
volse-hubzilla-ec7cbe272af07d184f8ecd5d2285bb8f31d2d9a4.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Cron.php2
-rw-r--r--Zotlabs/Update/_1220.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index d1c516f96..25e49b817 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -60,7 +60,7 @@ class Cron {
drop_item($rr['id'],false,(($rr['item_wall']) ? DROPITEM_PHASE1 : DROPITEM_NORMAL));
if($rr['item_wall']) {
// The notifier isn't normally invoked unless item_drop is interactive.
- Zotlabs\Daemon\Master::Summon( [ 'Notifier', 'drop', $rr['id'] ] );
+ Master::Summon( [ 'Notifier', 'drop', $rr['id'] ] );
}
}
}
diff --git a/Zotlabs/Update/_1220.php b/Zotlabs/Update/_1220.php
index adcb8c9c6..6ce09c16b 100644
--- a/Zotlabs/Update/_1220.php
+++ b/Zotlabs/Update/_1220.php
@@ -26,14 +26,14 @@ class _1220 {
if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
$r = q("CREATE TABLE IF NOT EXISTS listeners (
id int(11) NOT NULL AUTO_INCREMENT,
- target_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
- portable_id varchar(191) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',
- ltype int(11) NOT NULL DEFAULT '0',
+ target_id varchar(191) NOT NULL DEFAULT '',
+ portable_id varchar(191) NOT NULL DEFAULT '',
+ ltype int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (id),
KEY target_id (target_id),
KEY portable_id (portable_id),
KEY ltype (ltype)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
}