strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4318 from MrPetovan/bug/4314-fix-addon-reload

Browse source 
Fix addon reload
This commit is contained in:
Michael Vogel 2018-01-24 01:08:11 +01:00 committed by GitHub
commit a53fc3c7ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus'); define('FRIENDICA_CODENAME', 'Asparagus');
define('FRIENDICA_VERSION', '3.6-dev'); define('FRIENDICA_VERSION', '3.6-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1246); define('DB_UPDATE_VERSION', 1247);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**

5
src/Core/Addon.php
View file

@ -4,10 +4,9 @@
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use dba; use dba;
require_once 'include/dba.php'; require_once 'include/dba.php';
@ -83,7 +82,7 @@ class Addon
if (strlen($addons)) { if (strlen($addons)) {
$r = dba::select('addon', [], ['installed' => 1]); $r = dba::select('addon', [], ['installed' => 1]);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$installed = $r; $installed = dba::inArray($r);
} else { } else {
$installed = []; $installed = [];
} }

11
update.php
View file

@ -7,6 +7,8 @@ use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\User; use Friendica\Model\User;
require_once 'include/dba.php';
/** /**
* *
* update.php - automatic system update * update.php - automatic system update
@ -173,3 +175,12 @@ function update_1245() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1247() {
// Removing hooks with the old name
dba::e("DELETE FROM `hook`
WHERE `hook` LIKE 'plugin_%'");
// Make sure we install the new renamed ones
Addon::reload();
}