Merge pull request zikula#365 from planetenkiller/fixes_master_branch

small bugfixes master branch
tfotis · Apr 22, 2012 · 9101aea · 9101aea
2 parents b22d644 + 84d2d53
commit 9101aea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Zikula/Framework/Exception/RuntimeException.php b/src/Zikula/Framework/Exception/RuntimeException.php
@@ -18,7 +18,7 @@
 /**
  * Exception class.
  */
-class RuntimeException extends \RumtimeException
+class RuntimeException extends \RuntimeException
 {
     /**
      * Debug value.

diff --git a/web/system/GroupsModule/Entity/GroupMembership.php b/web/system/GroupsModule/Entity/GroupMembership.php
@@ -22,7 +22,7 @@
  * We use annotations to define the entity mappings to database (see http://www.doctrine-project.org/docs/orm/2.1/en/reference/basic-mapping.html).
  *
  * @ORM\Entity
- * @ORM\Table(name="group_membership",indexes={@ORM\index(name="gid_uid",columns={"uid","gid"})})
+ * @ORM\Table(name="group_membership",indexes={@ORM\Index(name="gid_uid",columns={"uid","gid"})})
  */
 class GroupMembership extends EntityAccess
 {

diff --git a/web/system/UsersModule/Controller/AuthenticationController.php b/web/system/UsersModule/Controller/AuthenticationController.php
@@ -193,7 +193,7 @@ public function validateAuthenticationInformationAction(array $args)
 
         if (!is_array($authenticationMethod) || empty($authenticationMethod) || !isset($authenticationMethod['modname'])) {
             throw new \Zikula\Framework\Exception\FatalException($this->__('The authentication module name was not specified during an attempt to validate user authentication information.'));
-        } elseif ($authenticationMethod['modname'] != 'Users') {
+        } elseif ($authenticationMethod['modname'] != 'UsersModule') {
             throw new \Zikula\Framework\Exception\FatalException($this->__f('Attempt to validate authentication information with incorrect authentication module. Credentials should be validated with the \'%1$s\' module instead.', array($authenticationMethod['modname'])));
         }