aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-20 06:34:54 -0700
committerfriendica <info@friendica.com>2012-08-20 06:34:54 -0700
commit2f81fb438508436ad6424c53f0f2dc878969b929 (patch)
treeb866c8a6b4c917af19c49c1067c1e5c1c1975f3c
parent34e42c4cb34c78d9cb8ac48e9d80e58984346156 (diff)
downloadvolse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.tar.gz
volse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.tar.bz2
volse-hubzilla-2f81fb438508436ad6424c53f0f2dc878969b929.zip
upstream fixes
-rw-r--r--boot.php4
-rw-r--r--include/bbcode.php1
-rw-r--r--include/conversation.php50
-rwxr-xr-xmod/install.php4
-rw-r--r--version.inc2
5 files changed, 33 insertions, 28 deletions
diff --git a/boot.php b/boot.php
index b2b92d0ea..646f968cd 100644
--- a/boot.php
+++ b/boot.php
@@ -913,6 +913,10 @@ if(! function_exists('login')) {
$tpl = get_markup_template("logout.tpl");
}
else {
+ $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
+ '$baseurl' => $a->get_baseurl(true)
+ ));
+
$tpl = get_markup_template("login.tpl");
$_SESSION['return_url'] = $a->query_string;
}
diff --git a/include/bbcode.php b/include/bbcode.php
index 0889e76ce..f43d2f547 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -324,6 +324,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
+ $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
// Try to Oembed
if ($tryoembed) {
diff --git a/include/conversation.php b/include/conversation.php
index 0d770ef40..2edb551a5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -432,37 +432,37 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$template = $wallwall_template;
$commentww = 'ww';
}
- }
- else if($item['owner-link']) {
+ else if($item['owner-link']) {
- $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
- $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
- $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
- if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+ $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+ $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+ $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+ if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
- // The author url doesn't match the owner (typically the contact)
- // and also doesn't match the contact alias.
- // The name match is a hack to catch several weird cases where URLs are
- // all over the park. It can be tricked, but this prevents you from
- // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
- // well that it's the same Bob Smith.
+ // The author url doesn't match the owner (typically the contact)
+ // and also doesn't match the contact alias.
+ // The name match is a hack to catch several weird cases where URLs are
+ // all over the park. It can be tricked, but this prevents you from
+ // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+ // well that it's the same Bob Smith.
- // But it could be somebody else with the same name. It just isn't highly likely.
+ // But it could be somebody else with the same name. It just isn't highly likely.
- $owner_url = $item['owner-link'];
- $owner_photo = $item['owner-avatar'];
- $owner_name = $item['owner-name'];
- $template = $wallwall_template;
- $commentww = 'ww';
- // If it is our contact, use a friendly redirect link
- if((link_compare($item['owner-link'],$item['url']))
- && ($item['network'] === NETWORK_DFRN)) {
- $owner_url = $redirect_url;
- $osparkle = ' sparkle';
+ $owner_url = $item['owner-link'];
+ $owner_photo = $item['owner-avatar'];
+ $owner_name = $item['owner-name'];
+ $template = $wallwall_template;
+ $commentww = 'ww';
+ // If it is our contact, use a friendly redirect link
+ if((link_compare($item['owner-link'],$item['url']))
+ && ($item['network'] === NETWORK_DFRN)) {
+ $owner_url = $redirect_url;
+ $osparkle = ' sparkle';
+ }
+ else
+ $owner_url = zrl($owner_url);
}
- else
- $owner_url = zrl($owner_url);
}
}
if($profile_owner == local_user()) {
diff --git a/mod/install.php b/mod/install.php
index cb21a71eb..4e4631b85 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -60,7 +60,7 @@ function install_post(&$a) {
return;
break;
- case 4;
+ case 4:
$urlpath = $a->get_path();
$dbhost = notags(trim($_POST['dbhost']));
$dbuser = notags(trim($_POST['dbuser']));
@@ -155,11 +155,11 @@ function install_content(&$a) {
}
if(x($a->data,'txt') && strlen($a->data['txt'])) {
- $tpl = get_markup_template('install.tpl');
$db_return_text .= manual_config($a);
}
if ($db_return_text!="") {
+ $tpl = get_markup_template('install.tpl');
return replace_macros($tpl, array(
'$title' => $install_title,
'$pass' => "",
diff --git a/version.inc b/version.inc
index cfe5b3a5e..f7be7ef5c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-08-16.48
+2012-08-19.51