X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2FBootstrap.php;h=f3fb3999fbdf836831c3fb20a20f7ee74c846ef7;hp=36471f3c38c3c159991fe184a0a134a1cc4dda20;hb=c06c7fd6e6f26d31abb8d7c9a9f9e3f2d5b27d5c;hpb=c1aeb7538786d8c9f3b3337c0b71e21ef89d9c77

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 36471f3..f3fb399 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,5 +1,5 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap {
@@ -15,10 +15,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap {
     }
 
     public function run() {
-        $sessionConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/session.ini', APPLICATION_ENV);
-        Zend_Session::setOptions($sessionConfig->toArray());
         Zend_Controller_Action_HelperBroker::getStaticHelper('ViewRenderer')->initView(APPLICATION_PATH . '/views/', 'Syj_View');
-
         parent::run();
     }
 
@@ -33,6 +30,18 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap {
         if (strpos ($class, "Syj_") === 0) {
             $segments = explode ('_', $class);
 
+            if (count($segments) < 2) {
+                return;
+            }
+
+            if (count($segments) == 2) {
+                $filename = APPLICATION_PATH . '/' . end($segments) . '.php';
+                if (Zend_Loader::isReadable($filename)) {
+                    include_once $filename;
+                }
+                return;
+            }
+
             if (count($segments) < 3) {
                 return;
             }