ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 14:50:48 +03:00
Code Issues Releases Wiki Activity

Merge pull request #862 from Xmk/chiffa

Browse source 
install converter fix
This commit is contained in:
Maxim Mzhelskiy 2017-03-21 00:14:58 +07:00 committed by GitHub
parent 21f832d1b8 1211bc0b1b
commit 930cffcbc5
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
application/install/backend/step.php
View file

@ -279,8 +279,7 @@ abstract class InstallStep
if ($rResult = mysqli_query($this->rDbLink, $sQuery)) {
return $rResult;
}
$aErrors[] = mysqli_error($this->rDbLink);
return false;
return $this->addError(mysqli_error($this->rDbLink));
}
protected function dbSelect($sQuery)
@ -310,6 +309,8 @@ abstract class InstallStep
foreach ($aFields as $sFields => $sValue) {
if (is_int($sValue)) {
$aPath[] = "`{$sFields}` = " . $sValue;
} elseif (is_null($sValue)) {
$aPath[] = "`{$sFields}` = 'NULL'";
} else {
$aPath[] = "`{$sFields}` = '" . mysqli_escape_string($this->rDbLink, $sValue) . "'";
}

7
application/install/backend/step/updateVersion.php
View file

@ -69,7 +69,6 @@ class InstallStepUpdateVersion extends InstallStep
*/
public function convertFrom_2_0_0_to_2_0_1($oDb)
{
/**
* Запускаем SQL патч
*/
@ -137,10 +136,6 @@ class InstallStepUpdateVersion extends InstallStep
return $this->addError(join('<br/>', $aErrors));
}
}
/**
* Дата публикации
*/
$this->dbQuery("UPDATE prefix_topic SET topic_date_publish = topic_date_add");
/**
* Конвертируем опросы
* Сначала проверяем необходимость конвертации опросов
@ -751,7 +746,7 @@ class InstallStepUpdateVersion extends InstallStep
}
if ($this->getErrors()) {
if ($aErrors = $this->getErrors()) {
return $this->addError(join('<br/>', $aErrors));
}
return true;