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

install converter fix

Browse source
This commit is contained in:
Chiffa 2017-03-20 20:54:11 +05:00
parent 21f832d1b8
commit 1211bc0b1b
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)) { if ($rResult = mysqli_query($this->rDbLink, $sQuery)) {
return $rResult; return $rResult;
} }
$aErrors[] = mysqli_error($this->rDbLink); return $this->addError(mysqli_error($this->rDbLink));
return false;
} }
protected function dbSelect($sQuery) protected function dbSelect($sQuery)
@ -310,6 +309,8 @@ abstract class InstallStep
foreach ($aFields as $sFields => $sValue) { foreach ($aFields as $sFields => $sValue) {
if (is_int($sValue)) { if (is_int($sValue)) {
$aPath[] = "`{$sFields}` = " . $sValue; $aPath[] = "`{$sFields}` = " . $sValue;
} elseif (is_null($sValue)) {
$aPath[] = "`{$sFields}` = 'NULL'";
} else { } else {
$aPath[] = "`{$sFields}` = '" . mysqli_escape_string($this->rDbLink, $sValue) . "'"; $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) public function convertFrom_2_0_0_to_2_0_1($oDb)
{ {
/** /**
* Запускаем SQL патч * Запускаем SQL патч
*/ */
@ -137,10 +136,6 @@ class InstallStepUpdateVersion extends InstallStep
return $this->addError(join('<br/>', $aErrors)); 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 $this->addError(join('<br/>', $aErrors));
} }
return true; return true;