diff --git a/core/database.class.php b/core/database.class.php index 97f7c717..e7c4e27d 100644 --- a/core/database.class.php +++ b/core/database.class.php @@ -470,6 +470,8 @@ class Database { * Returns the number of tables present in the current database. */ public function count_tables() { + if(is_null($this->db) || is_null($this->engine)) $this->connect_db(); + if($this->engine->name === "mysql") { return count( $this->get_all("SHOW TABLES") diff --git a/core/page.class.php b/core/page.class.php index 879b4a53..f56a4d46 100644 --- a/core/page.class.php +++ b/core/page.class.php @@ -234,6 +234,17 @@ class Page { } } + /** + * This function grabs all the CSS and JavaScript files sprinkled throughout Shimmie's folders, + * concatenates them together into two large files (one for CSS and one for JS) and then stores + * them in the /cache/ directory for serving to the user. + * + * Why do this? Two reasons: + * 1. Reduces the number of files the user's browser needs to download. + * 2. Allows these cached files to be compressed/minified by the admin. + * + * TODO: This should really be configurable somehow... + */ protected function add_auto_html_headers() { global $config; diff --git a/index.php b/index.php index 73b83a77..a2bdaa8a 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * \mainpage Shimmie2 / SCore Documentation * * SCore is a framework designed for writing flexible, extendable applications. - * Whereas most PHP apps are built monolithicly, score's event-based nature + * Whereas most PHP apps are built monolithically, score's event-based nature * allows parts to be mixed and matched. For instance, the most famous * collection of score extensions is the Shimmie image board, which includes * user management, a wiki, a private messaging system, etc. But one could @@ -14,8 +14,8 @@ * * Dijkstra will kill me for personifying my architecture, but I can't think * of a better way without going into all the little details. - * There are a bunch of Extension subclasses, they talk to eachother by sending - * and recieving Event subclasses. The primary driver for each conversation is the + * There are a bunch of Extension subclasses, they talk to each other by sending + * and receiving Event subclasses. The primary driver for each conversation is the * initial PageRequestEvent. If an Extension wants to display something to the * user, it adds a block to the Page data store. Once the conversation is over, the Page is passed to the * current theme's Layout class which will tidy up the data and present it to diff --git a/install.php b/install.php index f2984e9e..a52154e5 100644 --- a/install.php +++ b/install.php @@ -1,8 +1,14 @@ - +