diff options
| author | Malf Furious <m@lfurio.us> | 2016-01-01 16:58:34 -0500 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2016-01-01 16:58:34 -0500 |
| commit | 03dd6556041ec11efe86f36d53db38c02d4362a7 (patch) | |
| tree | e2565c1e1dc7ba5de7342b7b6199d970c60dae94 /app/class/framework.class.php | |
| parent | c36269f976cb8287f1b6e17d4b0a958e4e9741da (diff) | |
| parent | 0a92a484554f214d0e499c872807e6b0a3e865ad (diff) | |
| download | scrott-03dd6556041ec11efe86f36d53db38c02d4362a7.tar.gz scrott-03dd6556041ec11efe86f36d53db38c02d4362a7.zip | |
Merge branch 'datastructures' into dev
Diffstat (limited to 'app/class/framework.class.php')
| -rw-r--r-- | app/class/framework.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/class/framework.class.php b/app/class/framework.class.php index eea6c25..d1293de 100644 --- a/app/class/framework.class.php +++ b/app/class/framework.class.php @@ -50,7 +50,7 @@ abstract class Framework /* * Get or create the app's database connection object (this is a singleton object and dependent on system-level config) */ - function getDbConnection() + static function getDbConnection() { global $_SCROTT; |