Merge branch 'master' into trinidad

2015-01-04 12:30:51 -08:00
parent edd1ad37c4 ebb1a61684
commit 82a37ebae3
6 changed files with 89 additions and 81 deletions
@@ -1025,6 +1025,7 @@ class App {
 			'$head_js' => head_get_js(),
 			'$js_strings' => js_strings(),
 			'$zid' => get_my_address(),
+			'$channel_id' => $this->profile['uid'],
 		)) . $this->page['htmlhead'];

 		// always put main.js at the end