MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix any update issues that may arise from update 1081

Browse source
This commit is contained in:
Friendika 2011-08-26 21:51:12 -07:00
parent f48a758a1e
commit e3dbb63393
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1084' ); define ( 'FRIENDIKA_VERSION', '2.2.1084' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1082 ); define ( 'DB_UPDATE_VERSION', 1083 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

10
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1082 ); define( 'UPDATE_VERSION' , 1083 );
/** /**
* *
@ -676,8 +676,16 @@ function update_1080() {
} }
function update_1081() { function update_1081() {
// there was a typo in update 1081 so it was corrected and moved up to 1082
}
function update_1082() {
q("ALTER TABLE `photo` ADD `guid` CHAR( 64 ) NOT NULL AFTER `contact-id`, q("ALTER TABLE `photo` ADD `guid` CHAR( 64 ) NOT NULL AFTER `contact-id`,
ADD INDEX ( `guid` ) "); ADD INDEX ( `guid` ) ");
// make certain the following code is only executed once
$r = q("select `id` from `photo` where `guid` != '' limit 1");
if($r && count($r))
return;
$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`"); $r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {