From 95a425a1f39e784d7dc8a8b7302cf24bc8c0f0f4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 4 Nov 2010 00:37:29 -0700
Subject: minor stuff

---
 include/items.php | 4 ++--
 index.php         | 5 +++++
 util/strings.php  | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 7daf4042c..783ca63e0 100644
--- a/include/items.php
+++ b/include/items.php
@@ -500,9 +500,9 @@ function encode_rel_links($links) {
 			$o .= 'type="' . $link['attribs']['']['type'] . '" ';
 		if($link['attribs']['']['href'])
 			$o .= 'type="' . $link['attribs']['']['href'] . '" ';
-		if($link['attribs'][NAMESPACE_MEDIA]['width'])
+		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
 			$o .= 'media:width="' . $link['attribs'][NAMESPACE_MEDIA]['width'] . '" ';
-		if($link['attribs'][NAMESPACE_MEDIA]['height'])
+		if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
 			$o .= 'media:height="' . $link['attribs'][NAMESPACE_MEDIA]['height'] . '" ';
 		$o .= ' />' . "\n" ;
 	}
diff --git a/index.php b/index.php
index 895e439ea..e858fcc97 100644
--- a/index.php
+++ b/index.php
@@ -105,6 +105,11 @@ $a->page['content'] .=  '<div id="pause"></div>';
 if($a->module != 'install')
 	require_once("nav.php");
 
+// make sure the desired theme exists, though if the default theme doesn't exist we're stuffed.
+
+if((x($_SESSION,'theme')) && (! file_exists('/view/theme/' . $_SESSION['theme'] . '/style.css')))
+	unset($_SESSION['theme']);
+
 $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
 	'$stylesheet' => $a->get_baseurl() . '/view/theme/'
 		. ((x($_SESSION,'theme')) ? $_SESSION['theme'] : 'default')
diff --git a/util/strings.php b/util/strings.php
index 43a751dc2..079d1de13 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -114,7 +114,7 @@ $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for t
 $a->strings['Please see the file INSTALL.'] = 'Please see the file INSTALL.';
 $a->strings['Database import failed.'] = 'Database import failed.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
-$a->strings['Welcome to the Mistpark Social Network.'] = 'Welcome to the Mistpark Social Network.';
+$a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
 $a->strings['Submit'] = 'Submit';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
 $a->strings[' : '] = ' : ';
@@ -175,6 +175,7 @@ $a->strings['New Follower'] = 'New Follower';
 $a->strings['No notifications.'] = 'No notifications.';
 $a->strings['Photo Albums'] = 'Photo Albums';
 $a->strings['Contact Photos'] = 'Contact Photos';
+$a->strings['Contact information unavailable'] = 'Contact information unavailable';
 $a->strings['Profile Photos'] = 'Profile Photos';
 $a->strings['Album not found.'] = 'Album not found.';
 $a->strings['Delete Album'] = 'Delete Album';
-- 
cgit v1.2.3