Merge branch 'develop'

omeka · Aug 22, 2017 · ed6b452 · ed6b452
2 parents 3736653 + b131c66
commit ed6b452
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/EditorialPlugin.php b/EditorialPlugin.php
@@ -370,7 +370,7 @@ protected function sendEmails($block)
         $db = $this->_db;
         $userTable = $db->getTable('User');
         $userSelect = $userTable->getSelect();
-        $userSelect->where('id IN (?)', $options['email_recipients']);
+        $userSelect->where('users.id IN (?)', $options['email_recipients']);
         $users = $userTable->fetchObjects($userSelect);
         $userEmails = array();
         foreach ($users as $user) {
@@ -431,7 +431,7 @@ protected function adjustPermissions($block)
             $users = array();
         } else {
             $userSelect = $userTable->getSelect();
-            $userSelect->where('id IN (?)', $options['allowed_users']);
+            $userSelect->where('users.id IN (?)', $options['allowed_users']);
             $users = $userTable->fetchObjects($userSelect);
         }
         foreach ($users as $user) {

diff --git a/libraries/EditorialExhibitAccessAclAssertion.php b/libraries/EditorialExhibitAccessAclAssertion.php
@@ -18,7 +18,7 @@ public function assert(
             return true;
         }
 
-        if (get_class($role) == 'User' && get_class($resource) == 'Exhibit') {
+        if (($role instanceof User) && get_class($resource) == 'Exhibit') {
             if ($privilege == 'edit') {
                 $db = get_db();
                 $accessTable = $db->getTable('EditorialExhibitAccess');

diff --git a/plugin.ini b/plugin.ini
@@ -2,7 +2,7 @@
 name="Editorial"
 author="Roy Rosenzweig Center for History and New Media"
 description="Allows editorial feedback when building exhibits"
-version="1.0.2"
+version="1.0.3"
 support_link="http://omeka.org/forums/forum/plugins"
 link="http://omeka.org/codex/Plugins/Editorial"
 omeka_minimum_version="2.4"