clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3555 from annando/semaphore-fix 

Hopefully a fix for semaphore warnings and for the missing field
This commit is contained in:
Tobias Diekershoff 2017-06-29 06:40:32 +02:00 committed by GitHub
parent f846233a6b 526db18f5c
commit ec29d3f446
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'FRIENDICA_VERSION', '3.5.3-dev' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1231 ); define ( 'DB_UPDATE_VERSION', 1232 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

3
include/poller.php
View File

@ -834,8 +834,5 @@ if (array_search(__file__,get_included_files())===0){
get_app()->end_process(); get_app()->end_process();
Lock::remove('poller_worker');
Lock::remove('poller_worker_process');
killme(); killme();
} }

6
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define('UPDATE_VERSION' , 1231); define('UPDATE_VERSION' , 1232);
/** /**
* *
@ -1730,7 +1730,7 @@ function update_1202() {
dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP)); dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
} }
function update_1230() { function update_1231() {
// For this special case we have to use the old update routine // For this special case we have to use the old update routine
$r = q("ALTER TABLE `workerqueue` ADD `done2` tinyint(1) NOT NULL DEFAULT 0"); $r = q("ALTER TABLE `workerqueue` ADD `done` tinyint(1) NOT NULL DEFAULT 0");
} }