Merge branch '2.8' into 2.9

thorsten · Feb 1, 2015 · ff876ef · ff876ef
2 parents 8b5ccc8 + 2d593c4
commit ff876ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/phpmyfaq/admin/record.edit.php b/phpmyfaq/admin/record.edit.php
@@ -763,7 +763,7 @@ function extractor(query) {
         $('#tags').focus(function() { showHelp('tags'); });
 
         // Override FAQ permissions with Category permission to avoid confused users
-        $('#phpmyfaq-categories option:selected').each(function() {
+        $('#phpmyfaq-categories').click(function() {
             var categories = $('#phpmyfaq-categories option:selected').map(function() {
                 return $(this).val();
             }).get();

diff --git a/phpmyfaq/admin/record.save.php b/phpmyfaq/admin/record.save.php
@@ -185,14 +185,10 @@
         // Add user permissions
         $faq->deletePermission('user', $recordId);
         $faq->addPermission('user', $recordId, $permissions['restricted_user']);
-        $category->deletePermission('user', $categories['rubrik']);
-        $category->addPermission('user', $categories['rubrik'], $permissions['restricted_user']);
         // Add group permission
         if ($faqConfig->get('security.permLevel') != 'basic') {
             $faq->deletePermission('group', $recordId);
             $faq->addPermission('group', $recordId, $permissions['restricted_groups']);
-            $category->deletePermission('group', $categories['rubrik']);
-            $category->addPermission('group', $categories['rubrik'], $permissions['restricted_groups']);
         }
 
         // All the other translations        

diff --git a/phpmyfaq/config/constants.php b/phpmyfaq/config/constants.php
@@ -164,7 +164,8 @@
     'bot',
     'spider',
     'Yahoo! Slurp',
-    'htdig'
+    'htdig',
+    'gsa-crawler'
 ];
 
 /****************************************************************************