merge upstream

2012-08-11 18:54:23 -07:00
parent cac2d40832
commit e80d69d25b
31 changed files with 255 additions and 132 deletions
--- a/boot.php
+++ b/boot.php
@@ -399,6 +399,8 @@ if(! class_exists('App')) {
 		public	$sourcename = '';
 		public	$videowidth = 425;
 		public	$videoheight = 350;
+		public	$force_max_items = 0;
+		public	$theme_thread_allow = true;

 		private $scheme;
 		private $hostname;