diff --git a/assets/css.php b/assets/css.php index c5536b0..ae56a64 100755 --- a/assets/css.php +++ b/assets/css.php @@ -27,7 +27,7 @@ require('./config/config.php'); $groups = require("./config/css_groups.php"); //The name of this file -$this_file = $css_root.'css.php'; +$this_file = __FILE__; // -------------------------------------------------------------------------- diff --git a/assets/js.php b/assets/js.php index bc71d73..69faadd 100755 --- a/assets/js.php +++ b/assets/js.php @@ -28,7 +28,7 @@ $groups_file = "./config/js_groups.php"; $groups = require($groups_file); //The name of this file -$this_file = 'js.php'; +$this_file = __FILE__; // -------------------------------------------------------------------------- diff --git a/docs/classes/DB.html b/docs/classes/DB.html index a429459..ca7cbb6 100644 --- a/docs/classes/DB.html +++ b/docs/classes/DB.html @@ -1583,7 +1583,7 @@ for complex select queries
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index 7c3a81e..53709c7 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -679,7 +679,7 @@ the connection/database
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index e8f4ccc..2a42341 100644 --- a/docs/classes/DB_Reg.html +++ b/docs/classes/DB_Reg.html @@ -152,7 +152,7 @@ and organizes database connections

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index afa98fa..bf9757c 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -269,7 +269,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 1a1b19a..5f35f34 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -209,7 +209,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index c106625..ea1589c 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -833,7 +833,7 @@ the last query executed
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index 5d94f1f..9b562a7 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -504,7 +504,7 @@ the query
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index 178c54b..8babdb2 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -297,7 +297,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index c54142d..db964b2 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -212,7 +212,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MM.html b/docs/classes/MM.html index 7375dec..780f1ee 100644 --- a/docs/classes/MM.html +++ b/docs/classes/MM.html @@ -434,7 +434,7 @@ dynamic methods
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MM_Controller.html b/docs/classes/MM_Controller.html index af44ddd..2f0e517 100644 --- a/docs/classes/MM_Controller.html +++ b/docs/classes/MM_Controller.html @@ -764,7 +764,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MM_Model.html b/docs/classes/MM_Model.html index a9f3682..788b56a 100644 --- a/docs/classes/MM_Model.html +++ b/docs/classes/MM_Model.html @@ -728,7 +728,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MM_Output.html b/docs/classes/MM_Output.html index eae1190..4e7c3b6 100644 --- a/docs/classes/MM_Output.html +++ b/docs/classes/MM_Output.html @@ -640,7 +640,7 @@ Used for outputing HTML
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MM_Page.html b/docs/classes/MM_Page.html index 44216c0..229a7fb 100644 --- a/docs/classes/MM_Page.html +++ b/docs/classes/MM_Page.html @@ -972,7 +972,7 @@ supports

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index 25a8426..41fc958 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -869,7 +869,7 @@ the connection/database
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index e687ab4..9ec51cc 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index 1b2dc21..6ca18c5 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index fdf32ea..1390085 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -871,7 +871,7 @@ the connection/database
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index e009fc2..c863cd0 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 18d06ab..ea474f8 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -203,7 +203,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index 30e7798..bc67ebd 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -871,7 +871,7 @@ the connection/database
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index 710b7a3..e049556 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -297,7 +297,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index 7bf864f..4fe0827 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index ebb71fd..3b9c9fe 100644 --- a/docs/classes/Query_Builder.html +++ b/docs/classes/Query_Builder.html @@ -1222,7 +1222,7 @@ for complex select queries
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index fad1ab3..036c01b 100644 --- a/docs/classes/SQLite.html +++ b/docs/classes/SQLite.html @@ -886,7 +886,7 @@ method if the database does not support 'TRUNCATE';
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index 61ee1d7..38bb000 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -281,7 +281,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index a87a23d..f4e6962 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index 867b957..b7e185c 100644 --- a/docs/classes/Settings.html +++ b/docs/classes/Settings.html @@ -244,7 +244,7 @@ directly - the settings should be safe!
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Welcome.html b/docs/classes/Welcome.html index b8a175d..78c0298 100644 --- a/docs/classes/Welcome.html +++ b/docs/classes/Welcome.html @@ -906,7 +906,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/Welcome_Model.html b/docs/classes/Welcome_Model.html index df65fec..a92b949 100644 --- a/docs/classes/Welcome_Model.html +++ b/docs/classes/Welcome_Model.html @@ -846,7 +846,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/classes/miniMVC.html b/docs/classes/miniMVC.html index 66f5d2b..228e66a 100644 --- a/docs/classes/miniMVC.html +++ b/docs/classes/miniMVC.html @@ -615,7 +615,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index 98adad0..4883a9c 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -67,7 +67,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/errors.html b/docs/errors.html index 25053e5..7ecb0c4 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -106,7 +106,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 89f9ae2..8a80850 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -64,7 +64,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/index.html b/docs/index.html index b7da5b4..28dd88e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,7 +80,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/markers.html b/docs/markers.html index 357db0e..43b4cbb 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -69,7 +69,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index e282a1c..4c4eb8d 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -702,7 +702,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/.html b/docs/packages/.html index 40d5ed5..e259acf 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -67,7 +67,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index 5088a55..eeace1a 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -185,7 +185,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index d190908..7820dc2 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -211,7 +211,7 @@ data-fetching methods

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 4e0f9d4..12ffd58 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -97,7 +97,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index 3296d43..62633a9 100644 --- a/docs/packages/Query.Query.html +++ b/docs/packages/Query.Query.html @@ -115,7 +115,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index 184d5f6..6eeb3c4 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -316,7 +316,7 @@ instantiates the specific db driver

+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/miniMVC.App.html b/docs/packages/miniMVC.App.html index 1cbd556..b8e1774 100644 --- a/docs/packages/miniMVC.App.html +++ b/docs/packages/miniMVC.App.html @@ -139,7 +139,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/miniMVC.System.html b/docs/packages/miniMVC.System.html index e4e76df..e9d79c2 100644 --- a/docs/packages/miniMVC.System.html +++ b/docs/packages/miniMVC.System.html @@ -137,7 +137,7 @@
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/packages/miniMVC.html b/docs/packages/miniMVC.html index 9a82f8e..e764fd5 100644 --- a/docs/packages/miniMVC.html +++ b/docs/packages/miniMVC.html @@ -474,7 +474,7 @@ display them cleanly
+ generated on 2012-05-03T11:38:41-04:00.
diff --git a/docs/structure.xml b/docs/structure.xml index 9232403..74633c1 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -5653,7 +5653,7 @@ display them cleanly]]> - + Convention-based micro-framework for PHP

]]> @@ -5896,33 +5896,33 @@ dynamic methods]]> - + unload function - + - + string - + $name - + load_config function - + - + string - + $name diff --git a/sys/miniMVC.php b/sys/miniMVC.php index e869c34..2a53e0c 100644 --- a/sys/miniMVC.php +++ b/sys/miniMVC.php @@ -333,26 +333,29 @@ class miniMVC extends MM { $class = "{$name}"; - if(class_exists($class, FALSE)) + // Load the class file if need be + if( ! class_exists($class, FALSE)) { - if ( ! isset($this->$name)) + if(is_file($path)) { - $this->$name = new $class; - return; + require_once($path); } } - if(is_file($path)) + // Create the object, and add it to the current miniMVC object + if (class_exists($class, FALSE)) { - require_once($path); - - if(class_exists($class, FALSE)) + if ( ! isset($this->$name)) { - if ( ! isset($this->$name)) + // Call a singleton, if the get_instance method exists + if (is_callable(array($class, 'get_instance'))) { - $this->$name = new $class; + $this->$name =& $class::get_instance(); return; } + + $this->$name = new $class; + return; } } }