From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Thu, 21 Mar 2013 13:23:26 +0000 (+0100)
Subject: Merge branch 'master' of ../application-blanche
X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fgalerie.git;a=commitdiff_plain;h=958e917c5c3e93a75a1a4b3aff11ac81b7e99863;hp=-c

Merge branch 'master' of ../application-blanche

Conflicts:
	config/application.config.php
	server_config/site.alias
---

958e917c5c3e93a75a1a4b3aff11ac81b7e99863
diff --combined config/application.config.php
index 1dab349,846b7b7..9f36ab0
--- a/config/application.config.php
+++ b/config/application.config.php
@@@ -2,7 -2,7 +2,8 @@@
  return array(
      'modules' => array(
          'Application',
+         'Auth',
 +        'Galerie',
      ),
      'module_listener_options' => array(
          'config_glob_paths'    => array(
diff --combined vendor/zf2biz/Custom/Model/EntityManager.php
index 8566ce2,de9806c..59f4b9c
--- a/vendor/zf2biz/Custom/Model/EntityManager.php
+++ b/vendor/zf2biz/Custom/Model/EntityManager.php
@@@ -59,7 -59,7 +59,7 @@@ abstract class EntityManager extends Ab
                  $keys[] = "{$k}: {$v}";
              }
              $keys = implode(', ', $keys);
-             throw new \Exception("cannot get row {{$keys}} in table 'galerie'");
+             throw new \Exception("cannot get row {{$keys}} in table '{$this->table}'");
          }
          return $row;
      }
@@@ -98,14 -98,13 +98,14 @@@
                  $entity->toUpdatableArray(),
                  $entity->toPrimaryArray()
              );
 +            die("update");
          } else {
              $keys = array();
 -            foreach($primary_array as $k => $v) {
 +            foreach($this->extract_primary($entity) as $k => $v) {
                  $keys[] = "{$k}: {$v}";
              }
              $keys = implode(', ', $keys);
-             throw new \Exception("cannot update row {{$keys}} in table 'galerie'");
+             throw new \Exception("cannot update row {{$keys}} in table '{$this->table}'");
          }
      }