Skip to content
Snippets Groups Projects
Commit 66cbb453 authored by Jared Hancock's avatar Jared Hancock
Browse files

oops: Don't crash installing help topics

parent b40eb4bd
No related branches found
No related tags found
No related merge requests found
...@@ -351,7 +351,9 @@ class Topic { ...@@ -351,7 +351,9 @@ class Topic {
} else { } else {
if (isset($vars['topic_id'])) if (isset($vars['topic_id']))
$sql .= ', topic_id='.db_input($vars['topic_id']); $sql .= ', topic_id='.db_input($vars['topic_id']);
if ($vars['topic_pid'] && $cfg->getTopicSortMode() != 'a') { // If in manual sort mode, place the new item directly below the
// parent item
if ($vars['topic_pid'] && $cfg && $cfg->getTopicSortMode() != 'a') {
$sql .= ', `sort`='.db_input( $sql .= ', `sort`='.db_input(
db_result(db_query('SELECT COALESCE(`sort`,0)+1 FROM '.TOPIC_TABLE db_result(db_query('SELECT COALESCE(`sort`,0)+1 FROM '.TOPIC_TABLE
.' WHERE `topic_id`='.db_input($vars['topic_pid'])))); .' WHERE `topic_id`='.db_input($vars['topic_pid']))));
...@@ -363,7 +365,7 @@ class Topic { ...@@ -363,7 +365,7 @@ class Topic {
else else
$errors['err']='Unable to create the topic. Internal error'; $errors['err']='Unable to create the topic. Internal error';
} }
if ($cfg->getTopicSortMode() == 'a') { if (!$cfg || $cfg->getTopicSortMode() == 'a') {
static::updateSortOrder(); static::updateSortOrder();
} }
return $rv; return $rv;
...@@ -371,7 +373,9 @@ class Topic { ...@@ -371,7 +373,9 @@ class Topic {
static function updateSortOrder() { static function updateSortOrder() {
// Fetch (un)sorted names // Fetch (un)sorted names
$names = static::getHelpTopics(false, true); if (!($names = static::getHelpTopics(false, true)))
return;
uasort($names, function($a, $b) { return strcmp($a, $b); }); uasort($names, function($a, $b) { return strcmp($a, $b); });
$update = array_keys($names); $update = array_keys($names);
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
notes: | notes: |
Product, service, or equipment related issues Product, service, or equipment related issues
- pid: 10 - topic_pid: 10
isactive: 1 isactive: 1
ispublic: 1 ispublic: 1
dept_id: 1 dept_id: 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment