Fix notice cause by blank robot data, a=chris
Fix notice cause by blank robot data, a=chris
diff --git a/src/controllers/components/AccountaccessComponent.php b/src/controllers/components/AccountaccessComponent.php
index a8e12a991..4e3bf9a6e 100644
--- a/src/controllers/components/AccountaccessComponent.php
+++ b/src/controllers/components/AccountaccessComponent.php
@@ -285,7 +285,7 @@ class AccountaccessComponent extends Component
$data['USER']['IS_BOT_USER'] = 0;
$role_model->deleteUserRole($user_id, $bot_role_id);
}
- if (isset($_REQUEST['BOT_TOKEN'])){
+ if (isset($_REQUEST['BOT_TOKEN'])) {
$user['BOT_TOKEN'] = $_REQUEST['BOT_TOKEN'];
$data['USER']['BOT_TOKEN'] = $user['BOT_TOKEN'];
$is_bot_updated = true;
diff --git a/src/library/PhraseParser.php b/src/library/PhraseParser.php
index 88c7fde9b..3c7adabb8 100755
--- a/src/library/PhraseParser.php
+++ b/src/library/PhraseParser.php
@@ -1148,7 +1148,7 @@ class PhraseParser
$meta_ids[] = 'layout:wide';
} else if ($site[CrawlConstants::HEIGHT] >
1.1 * $site[CrawlConstants::WIDTH]) {
- $meta_ids[] = 'layout:wide';
+ $meta_ids[] = 'layout:tall';
} else {
$meta_ids[] = 'layout:square';
}
diff --git a/src/models/UserModel.php b/src/models/UserModel.php
index a680fabf4..03e231835 100755
--- a/src/models/UserModel.php
+++ b/src/models/UserModel.php
@@ -294,6 +294,9 @@ class UserModel extends Model
if (!empty($bot_row)) {
$row['BOT_TOKEN'] = $bot_row['BOT_TOKEN'];
$row['CALLBACK_URL'] = $bot_row['CALLBACK_URL'];
+ } else {
+ $row['BOT_TOKEN'] = "";
+ $row['CALLBACK_URL'] = "";
}
}
return $row;