harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-09-02 20:54:00 -07:00
commit 360fda15e9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1150 ); define ( 'DB_UPDATE_VERSION', 1151 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

12
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1150 ); define( 'UPDATE_VERSION' , 1151 );
/** /**
* *
@ -1775,4 +1775,12 @@ function update_r1149() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1150() {
// hubzilla update does not apply here, but we're keeping the numbers in sync
return UPDATE_SUCCESS;
}