<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/merb_helpers_form.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -7,17 +7,12 @@ $LOAD_PATH.unshift(Merb.root / &quot;lib&quot;)
 Merb.push_path(:lib, Merb.root / &quot;lib&quot;) # uses **/*.rb as path glob.
 
 Merb::Config.use do |c|
-  
-  ### Sets up a custom session id key, if you want to piggyback sessions of other applications
-  ### with the cookie session store. If not specified, defaults to '_session_id'.
-  # c[:session_id_key] = '_session_id'
-  
+  c[:session_id_key] = 'panda'
   c[:session_secret_key]  = '4d5e9b90d9e92c236a2300d718059aef3a9b9cbe'
   c[:session_store] = 'cookie'
 end
 
-# use_orm :activerecord
-
+# Load Panda config
 require &quot;config&quot; / &quot;panda_init&quot;
 
 # Gem dependencies
@@ -33,23 +28,13 @@ dependency 'rvideo'
 require 'simple_db'
 require 'local_store'
 
+# Check panda config
 Panda::Config.check
 
 Merb::BootLoader.after_app_loads do
-  # Panda specific
-
   unless Merb.environment == &quot;test&quot;
     require &quot;config&quot; / &quot;aws&quot;
-    require &quot;config&quot; / &quot;mailer&quot; # If you want notification and encoding errors to be sent to you as well as logged
-  end
-
-  # Overriding form, as SimpleDB does not provide errors on object.
-  module Merb::Helpers::Form
-    def _singleton_form_context
-      self._default_builder = Merb::Helpers::Form::Builder::ResourcefulForm
-      @_singleton_form_context ||=
-        self._default_builder.new(nil, nil, self)
-    end
+    require &quot;config&quot; / &quot;mailer&quot;
   end
   
   Store = case Panda::Config[:videos_store]
@@ -69,5 +54,3 @@ Merb::BootLoader.after_app_loads do
     Merb.logger.info &quot;PANDA WARNING: Profile simple db domain does not exist. Please check that you have created all the required domains (see the getting started guide).&quot;
   end
 end
-
-EMAIL_SENDER = &quot;Panda &lt;info@pandastream.com&gt;&quot;</diff>
      <filename>config/init.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>56ba4bfd640ec56acba0a3b3748dbcf2bbfbda3c</id>
    </parent>
  </parents>
  <author>
    <name>Martyn Loughran</name>
    <email>martyn@new-bamboo.co.uk</email>
  </author>
  <url>http://github.com/reddavis/panda/commit/525ba747d487fa69a7b593709f7a6f4385986095</url>
  <id>525ba747d487fa69a7b593709f7a6f4385986095</id>
  <committed-date>2008-10-14T05:13:26-07:00</committed-date>
  <authored-date>2008-10-14T05:13:26-07:00</authored-date>
  <message>Clean up init file.</message>
  <tree>b9abae86a2f72b2a648cb48afe5f5a1cba9aae94</tree>
  <committer>
    <name>Martyn Loughran</name>
    <email>martyn@new-bamboo.co.uk</email>
  </committer>
</commit>
