From e351328528fc9dc4eac9b03ab1412a1f37e2ce57 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Mon, 16 Sep 2013 09:20:06 -0500
Subject: [PATCH 1/2] remove unused file

---
 config/configuration.dist.yml.php | 46 -------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 config/configuration.dist.yml.php

diff --git a/config/configuration.dist.yml.php b/config/configuration.dist.yml.php
deleted file mode 100644
index c521ed0b89..0000000000
--- a/config/configuration.dist.yml.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/** This script is only used when using the console.php chamilo:install command */
-/**
- * Database settings
- */
-// Your MySQL server
-$_configuration['db_host']     = 'localhost';
-// Your MySQL username
-$_configuration['db_user']     = 'root';
-// Your MySQL password
-$_configuration['db_password'] = 'root';
-
-// Prefix for course tables (IF NOT EMPTY, can be replaced by another prefix, else leave empty)
-/*$_configuration['table_prefix']          = '';
-// prefix all created bases (for courses) with this string
-$_configuration['db_prefix']             = '';*/
-// main Chamilo database
-$_configuration['main_database']         = 'chamilo';
-
-/**
- * Directory settings
- */
-// URL to the root of your Chamilo installation, e.g.: http://www.mychamilo.com/
-// Comment this line if you want to enable multiple URLs
-$_configuration['root_web']       = 'http://localhost/chamilo';
-$_configuration['root_sys']       = '/var/www/chamilo';
-
-/**
- * Misc. settings
- */
-// Security word for password recovery
-$_configuration['security_key']      = md5(uniqid(rand().time()));
-// Hash function method
-$_configuration['password_encryption']      = 'sha1';
-// You may have to restart your web server if you change this
-$_configuration['session_stored_in_db']     = false;
-// Session lifetime
-$_configuration['session_lifetime']         = 3600;
-// Activation for multi-url access
-//$_configuration['multiple_access_urls']   = true;
-//Deny the elimination of users
-$_configuration['deny_delete_users']        = false;
-//Prevent all admins from using the "login_as" feature
-$_configuration['login_as_forbidden_globally'] = false;
-// Version settings
-$_configuration['system_version']           = '1.10.0';

From fb42002b212edb71d8786265a57c7aa46c7cdebe Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Mon, 16 Sep 2013 09:39:34 -0500
Subject: [PATCH 2/2] connects debug to assetic debug

---
 main/inc/global.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index ea1e1342a5..b4239f3e42 100644
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -176,7 +176,7 @@ $app['debug'] = isset($_configuration['debug']) ? $_configuration['debug'] : fal
 $app['show_profiler'] = isset($_configuration['show_profiler']) ? $_configuration['show_profiler'] : false;
 
 // Enables assetic in order to load 1 compressed stylesheet or split files
-$app['assetic.enabled'] = false;
+$app['assetic.enabled'] = $app['debug'];
 // Dumps assets
 $app['assetic.auto_dump_assets'] = false;