Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 01:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
This commit is contained in:
Michael Vogel 2013-02-17 12:35:40 +01:00
commit 93143702ed
831 changed files with 37929 additions and 30644 deletions
Download patch file Download diff file Expand all files Collapse all files

44
update.php
View file

@ -1371,16 +1371,6 @@ ADD INDEX ( `datasize` ) ");
}
function update_1157() {
<<<<<<< HEAD
$r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
ADD INDEX (`uid`),
ADD INDEX (`aid`)");
if(!$r) return UPDATE_FAILED;
return UPDATE_SUCCESS;
}
function update_1158() {
$r = q("CREATE TABLE IF NOT EXISTS `dsprphotoq` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL,
@ -1390,6 +1380,20 @@ function update_1158() {
) ENGINE=MyISAM DEFAULT CHARSET=utf8"
);
if($r)
return UPDATE_SUCCESS;
}
function update_1158() {
set_config('system', 'maintenance', 1);
// Wait for 15 seconds for current requests to
// clear before locking up the database
sleep(15);
$r = q("CREATE INDEX event_id ON item(`event-id`)");
set_config('system', 'maintenance', 0);
if($r)
return UPDATE_SUCCESS;
@ -1402,13 +1406,27 @@ function update_1159() {
ADD INDEX (`uid`),
ADD INDEX (`aid`)");
if(!$r) return UPDATE_FAILED;
if(!$r)
return UPDATE_FAILED;
require_once('include/tags.php');
update_items();
return UPDATE_SUCCESS;
}
function update_1160() {
set_config('system', 'maintenance', 1);
// Wait for 15 seconds for current requests to
// clear before locking up the database
sleep(15);
$r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
// KEY `mention` (`mention`)
if(!$r) return UPDATE_FAILED;
set_config('system', 'maintenance', 0);
if(!$r)
return UPDATE_FAILED;
return UPDATE_SUCCESS;
}