0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Other minor fixes

Browse source
This commit is contained in:
Visman 2018-11-01 16:04:53 +07:00
parent a676d3e052
commit cb1ef0f640
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/Censorship/Save.php
View file

@ -11,7 +11,7 @@ class Save extends Method
* Сохраняет список нецензурных слов в базу
*
* @param array $list
*
*
* @return Censorship
*/
public function save(array $list)
@ -22,12 +22,12 @@ class Save extends Method
if (! isset($list[$id]['search_for']) || ! isset($list[$id]['replace_with'])) {
continue;
}
if ('' === trim($list[$id]['search_for'])) {
if ('' === \trim($list[$id]['search_for'])) {
if ($id > 0) {
$forDel[] = $id;
}
} elseif (isset($words[$id])) {
if ($list[$id]['search_for'] !== $words[$id]['search_for']
if ($list[$id]['search_for'] !== $words[$id]['search_for']
|| $list[$id]['replace_with'] !== $words[$id]['replace_with']
) {
$vars = [
@ -35,8 +35,8 @@ class Save extends Method
':search' => $list[$id]['search_for'],
':replace' => $list[$id]['replace_with'],
];
$sql = 'UPDATE ::censoring
SET search_for=?s:search, replace_with=?s:replace
$sql = 'UPDATE ::censoring
SET search_for=?s:search, replace_with=?s:replace
WHERE id=?i:id';
$this->c->DB->exec($sql, $vars);
}
@ -45,7 +45,7 @@ class Save extends Method
':search' => $list[$id]['search_for'],
':replace' => $list[$id]['replace_with'],
];
$sql = 'INSERT INTO ::censoring (search_for, replace_with)
$sql = 'INSERT INTO ::censoring (search_for, replace_with)
VALUES (?s:search, ?s:replace)';
$this->c->DB->exec($sql, $vars);
}

2
app/Models/Pages/Profile/Config.php
View file

@ -88,7 +88,7 @@ class Config extends Profile
* @param Validator $v
* @param int $value
*
* @return string
* @return int
*/
public function vToZero(Validator $v, $value)
{

2
app/Models/Pages/Profile/Edit.php
View file

@ -101,7 +101,7 @@ class Edit extends Profile
$valid = $v->validation($_FILES + $_POST);
$data = $v->getData();
unset($data['token'], $data['upload_avatar']);
unset($data['token'], $data['upload_avatar'], $data['delete_avatar']);
if ($valid) {
if ($v->delete_avatar || $v->upload_avatar instanceof Image) {