2.2 merge

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@828 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-19 18:59:00 +00:00 · 2008-04-19 18:59:00 +00:00 · 56ccd7df40
commit 56ccd7df40
parent f8b414a15f
2 changed files with 1 additions and 2 deletions
--- a/contrib/site_description/main.php
+++ b/contrib/site_description/main.php
@ -5,8 +5,6 @@
 * License: GPLv2
 * Description: Sets the "description" meta-info in the page header, for
 *              eg search engines to read
- *
- * This is currently the only example of a user-contributed extension~
 */
 class SiteDescription extends Extension {
 	public function receive_event($event) {
--- a/install.php
+++ b/install.php
@ -1,3 +1,4 @@
+<?php ob_start(); ?>
 <html>
 <!--
 - install.php (c) Shish 2007