friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

minor stuff

pull/1/head
Friendika 2010-11-04 00:37:29 -07:00
parent 4f8445760c
commit 95a425a1f3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -500,9 +500,9 @@ function encode_rel_links($links) {
$o .= 'type="' . $link['attribs']['']['type'] . '" '; $o .= 'type="' . $link['attribs']['']['type'] . '" ';
if($link['attribs']['']['href']) if($link['attribs']['']['href'])
$o .= 'type="' . $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'] . '" '; $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 .= 'media:height="' . $link['attribs'][NAMESPACE_MEDIA]['height'] . '" ';
$o .= ' />' . "\n" ; $o .= ' />' . "\n" ;
} }

5
index.php
View File

@ -105,6 +105,11 @@ $a->page['content'] .= '<div id="pause"></div>';
if($a->module != 'install') if($a->module != 'install')
require_once("nav.php"); 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( $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
'$stylesheet' => $a->get_baseurl() . '/view/theme/' '$stylesheet' => $a->get_baseurl() . '/view/theme/'
. ((x($_SESSION,'theme')) ? $_SESSION['theme'] : 'default') . ((x($_SESSION,'theme')) ? $_SESSION['theme'] : 'default')

3
util/strings.php
View File

@ -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['Please see the file INSTALL.'] = 'Please see the file INSTALL.';
$a->strings['Database import failed.'] = 'Database import failed.'; $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['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['Submit'] = 'Submit';
$a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.'; $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
$a->strings[' : '] = ' : '; $a->strings[' : '] = ' : ';
@ -175,6 +175,7 @@ $a->strings['New Follower'] = 'New Follower';
$a->strings['No notifications.'] = 'No notifications.'; $a->strings['No notifications.'] = 'No notifications.';
$a->strings['Photo Albums'] = 'Photo Albums'; $a->strings['Photo Albums'] = 'Photo Albums';
$a->strings['Contact Photos'] = 'Contact Photos'; $a->strings['Contact Photos'] = 'Contact Photos';
$a->strings['Contact information unavailable'] = 'Contact information unavailable';
$a->strings['Profile Photos'] = 'Profile Photos'; $a->strings['Profile Photos'] = 'Profile Photos';
$a->strings['Album not found.'] = 'Album not found.'; $a->strings['Album not found.'] = 'Album not found.';
$a->strings['Delete Album'] = 'Delete Album'; $a->strings['Delete Album'] = 'Delete Album';