aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-31 00:30:34 +0200
committerzottel <github@zottel.net>2012-03-31 00:30:34 +0200
commitf39e8126773e2a030cf84c8b9d428cc78546c1b9 (patch)
treeec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /include
parent2212e6931096d188be2dea27bcb4877f16c5c2f8 (diff)
parentaace55df0ad279d74c5e612078c3f29d114389dc (diff)
downloadvolse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.gz
volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.bz2
volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
-rwxr-xr-xinclude/auth.php6
-rwxr-xr-xinclude/contact_widgets.php2
-rwxr-xr-xinclude/conversation.php11
3 files changed, 13 insertions, 6 deletions
diff --git a/include/auth.php b/include/auth.php
index 835616a82..1341f3bb8 100755
--- a/include/auth.php
+++ b/include/auth.php
@@ -94,13 +94,17 @@ else {
// Otherwise it's probably an openid.
+ try {
require_once('library/openid.php');
$openid = new LightOpenID;
$openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url;
$a = get_app();
$openid->returnUrl = $a->get_baseurl(true) . '/openid';
- goaway($openid->authUrl());
+ goaway($openid->authUrl());
+ } catch (Exception $e) {
+ notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'. t('The error message was:').' '.$e->getMessage());
+ }
// NOTREACHED
}
}
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 9d7085d20..1f70e536f 100755
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -93,7 +93,7 @@ function fileas_widget($baseurl,$selected = '') {
}
return replace_macros(get_markup_template('fileas_widget.tpl'),array(
- '$title' => t('File Selections'),
+ '$title' => t('Saved Folders'),
'$desc' => '',
'$sel_all' => (($selected == '') ? 'selected' : ''),
'$all' => t('Everything'),
diff --git a/include/conversation.php b/include/conversation.php
index 1c3ee43b0..a9fb807ad 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -532,9 +532,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
}
+ $qc = $qcomment = null;
- $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
- $qcomment = (($qc) ? explode("\n",$qc) : null);
+ if(in_array('qcomment',$a->plugins)) {
+ $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+ $qcomment = (($qc) ? explode("\n",$qc) : null);
+ }
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
$comment = replace_macros($cmnt_tpl,array(
@@ -592,7 +595,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'classtagger' => "",
);
}
- $filer = t("file as");
+ $filer = t("save to folder");
}
@@ -912,7 +915,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$vidurl' => t("Please enter a video link/URL:"),
'$audurl' => t("Please enter an audio link/URL:"),
'$term' => t('Tag term:'),
- '$fileas' => t('File as:'),
+ '$fileas' => t('Save to Folder:'),
'$whereareu' => t('Where are you right now?')
));