Merge branch 'develop' into develop-next

include/client/templates/sidebar.tmpl.php

@@ -19,8 +19,9 @@ $BUTTONS = isset($BUTTONS) ? $BUTTONS : true;
         </div>
 <?php } ?>
         <div class="content"><?php
-    $faqs = FAQ::getFeatured()->select_related('category')->limit(5);
-    if ($faqs->all()) { ?>
+    if ($cfg->isKnowledgebaseEnabled()
+        && ($faqs = FAQ::getFeatured()->select_related('category')->limit(5))
+        && $faqs->all()) { ?>
             <section><div class="header"><?php echo __('Featured Questions'); ?></div>
 <?php   foreach ($faqs as $F) { ?>
             <div><a href="<?php echo ROOT_PATH; ?>kb/faq.php?id=<?php

scp/js/scp.js

@@ -193,7 +193,7 @@ var scp_prep = function() {
         }
      });
 
-    $('form select#cannedResp').select2({width: '300px'});
+    $('form select#cannedResp').select2({width: '350px'});
     $('form select#cannedResp').on('select2:opening', function (e) {
         var redactor = $('.richtext', $(this).closest('form')).data('redactor');
         if (redactor)