Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 3 insertions, 3 deletions

diff --git a/mod/setup.php b/mod/setup.php
index d192eaf21..b885388be 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -233,10 +233,10 @@ function setup_content(&$a) {
 
 			check_htconfig($checks);
 
-			check_smarty3($checks);
-
 			check_store($checks);
 
+			check_smarty3($checks);
+
 			check_keys($checks);
 			
 			if(x($_POST,'phpath'))
@@ -535,7 +535,7 @@ function check_store(&$checks) {
 	$status = true;
 	$help = "";
 
-	@os_mkdir('store',STORAGE_DEFAULT_PERMISSIONS);
+	@os_mkdir(TEMPLATE_BUILD_PATH,STORAGE_DEFAULT_PERMISSIONS,true);
 
 	if(	!is_writable('store') ) {