mirror of
https://github.com/friendica/friendica
synced 2025-04-26 13:10:11 +00:00
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts: boot.php database.sql include/template_processor.php update.php
This commit is contained in:
commit
cea7ca1df4
498 changed files with 24369 additions and 11652 deletions
29
update.php
29
update.php
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1132 );
|
||||
|
||||
define( 'UPDATE_VERSION' , 1133 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -1122,19 +1123,17 @@ function update_1130() {
|
|||
q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
|
||||
}
|
||||
|
||||
/**
|
||||
* CREATE TABLE for profiling
|
||||
*/
|
||||
function update_1131() {
|
||||
q("CREATE TABLE IF NOT EXISTS `profiling` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`function` VARCHAR( 255 ) NOT NULL ,
|
||||
`file` VARCHAR( 255 ) NOT NULL ,
|
||||
`line` INT NOT NULL DEFAULT '-1',
|
||||
`class` VARCHAR( 255 ) NOT NULL ,
|
||||
`time` FLOAT( 10, 2 ) NOT NULL ,
|
||||
INDEX ( `function` ) ,
|
||||
INDEX ( `file` )
|
||||
) ENGINE = MyISAM DEFAULT CHARSET=utf8;");
|
||||
function update_1131() {
|
||||
q("ALTER TABLE `contact` ADD `forum` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `writable` , ADD INDEX ( `forum` ) ");
|
||||
}
|
||||
|
||||
|
||||
function update_1132() {
|
||||
q("CREATE TABLE IF NOT EXISTS `userd` (
|
||||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`username` CHAR( 255 ) NOT NULL,
|
||||
INDEX ( `username` )
|
||||
) ENGINE = MYISAM ");
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue