Changeset 210 for trunk/trax/vendor

Timestamp:

05/29/06 01:36:55 (6 years ago)

Author:

john

Message:

fixed some syntax errors

Location:

trunk/trax/vendor/trax

Files:

• action_controller.php (modified) (1 diff)
• active_record.php (modified) (2 diffs)
• trax_generator.php (modified) (2 diffs)

trunk/trax/vendor/trax/action_controller.php

@@ -1100 +1100 @@
                     $spacer_file = substr(strrchr($spacer_path, "/"), 1);
                     $spacer_path = substr($spacer_path, 0, strripos($spacer_path, "/"));
-                    $spacer_file_with_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['views']."/".$spacer_path."/_".$spacer_file.".".Trax::$views_extension;
+                    $spacer_file_with_file = Trax::$views_path."/".$spacer_path."/_".$spacer_file.".".Trax::$views_extension;
                 } else {
                     $spacer_file = $spacer_path;

trunk/trax/vendor/trax/active_record.php

@@ -2017 +2017 @@
      *
      *  The name of the database normally comes from
-     *  $GLOBALS['TRAX_DB_SETTINGS'] which is set in {@link
+     *  Trax::$database_settings which is set in {@link
      *  environment.php} by reading file config/database.ini. The
      *  database name may be overridden by assigning a different name
@@ -2023 +2023 @@
      *  
      *  If there is a connection now open, as indicated by the saved
-     *  value of a DB object in $GLOBALS['ACTIVE_RECORD_DB'], and
+     *  value of a DB object in Trax::$active_record_connections[$connection_name], and
      *  {@link force_reconnect} is not true, then set the database
      *  fetch mode and return.
      *
      *  If there is no connection, open one and save a reference to
-     *  it in $GLOBALS['ACTIVE_RECORD_DB'].
+     *  it in Trax::$active_record_connections[$connection_name].
      *
      *  @uses $db

trunk/trax/vendor/trax/trax_generator.php

@@ -548 +548 @@
         }
 
-        $GLOBALS['current_controller_object'] =& $this;
+        Trax::$current_controller_object =& $this;
         $model_class_name = Inflector::classify($model_name);
         $singular_model_name = Inflector::singularize($model_name);
@@ -575 +575 @@
             $controller_name = Inflector::underscore($controller_name);    
         }
-        $GLOBALS['current_controller_name'] = $controller_name;
-        $controller_file =
-            "$this->controller_path/" . $controller_name."_controller.php";
-        $GLOBALS['current_controller_path'] = $controller_file;
+        Trax::$current_controller_name = $controller_name;
+        $controller_file = "$this->controller_path/" . $controller_name."_controller.php";
+        Trax::$current_controller_path = $controller_file;
         $non_scaffolded_actions = array();
         $illegal_views = array("index","add","edit","show");