merge upstream, slider work, refactor ping module, language selection work

2012-07-13 07:09:29 -07:00
parent 599f3d2961
commit a20a637727
42 changed files with 11867 additions and 286 deletions
--- a/index.php
+++ b/index.php
@@ -356,7 +356,10 @@ if($a->module != 'install') {
 * Build the page - now that we have all the components
 */

-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url()));
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], 
+	array('$stylesheet' => current_theme_url(),
+		'$theme' => current_theme() 
+	));

 $page    = $a->page;
 $profile = $a->profile;