Merge pull request #5 from cbodin/dev

pr for v0.1.4

Author: cbodin

framework/classes/Url.inc

@@ -69,6 +69,10 @@ class Url {
       'clean'    => Settings::get('clean_urls', true),
     );
 
+    // Let modules alter the options and path before generating the
+    // url.
+    Module::alterAction('preUrlGenerate', $path, $options);
+
     $site_urls = self::get();
 
     if ($options['scheme'] == 'http') {
@@ -114,6 +118,14 @@ class Url {
       $url .= '#' . $options['fragment'];
     }
 
+    $action_info = array(
+      'path' => $path,
+      'options' => $options,
+    );
+
+    // Let modules alter the url before output
+    Module::alterAction('postUrlGenerate', $url, $action_info);
+
     return $url;
   }
 

framework/classes/Variable.inc

@@ -183,8 +183,6 @@ class Variable {
   private static function checkDb() {
     // check if this function was called before
     if (!self::$tableInstalled) {
-      global $config;
-
       // Get the active database key
       $active_db = Database::getActive();
       $driver = Database::getDriver();
@@ -228,7 +226,7 @@ class Variable {
       $table = $sth->fetchColumn();
 
       if (!$table) {
-        switch ($config['database'][$active_db]['driver']) {
+        switch ($driver) {
           case 'mysql':
             $query = '
               CREATE TABLE velox_variables (

framework/modules/RedBeanPHP/RedBeanPHP.inc

@@ -18,7 +18,8 @@ foreach (Settings::get('database', array()) as $dbkey => $dbinfo) {
   call_user_func_array(array('R', $method), $args);
 }
 
-// dont change the database after deployment
-if (!Settings::get('development', false)) {
+$settings = Settings::get('RedBeanPHP', array());
+
+if (isset($settings) && $settings['freeze']) {
   R::freeze(true);
 }