aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-04 19:19:51 -0700
committerFriendika <info@friendika.com>2011-08-04 19:19:51 -0700
commitf0af4de4a795ed3914f0e8e8ae3417a315d3dcd3 (patch)
tree6d4a91eefea69caa9194f8de603cdefa47955d1e
parent639204c2ec29ccd74fbc2cb1eb597cca86e84f27 (diff)
downloadvolse-hubzilla-f0af4de4a795ed3914f0e8e8ae3417a315d3dcd3.tar.gz
volse-hubzilla-f0af4de4a795ed3914f0e8e8ae3417a315d3dcd3.tar.bz2
volse-hubzilla-f0af4de4a795ed3914f0e8e8ae3417a315d3dcd3.zip
wrap text from imported link in [quote]
-rw-r--r--boot.php14
-rw-r--r--mod/parse_url.php2
2 files changed, 14 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 3d1d884e3..35f295d06 100644
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php");
-define ( 'FRIENDIKA_VERSION', '2.2.1061' );
+define ( 'FRIENDIKA_VERSION', '2.2.1062' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1077 );
@@ -607,6 +607,18 @@ function check_config(&$a) {
}}
+function get_guid() {
+ $exists = true;
+ do {
+ $s = random_string(16);
+ $r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
+ if(! results($r))
+ $exists = false;
+ } while($exists);
+ q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s));
+ return $s;
+}
+
// wrapper for adding a login box. If $register == true provide a registration
// link. This will most always depend on the value of $a->config['register_policy'].
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 46c6b46e9..9bb0bc464 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -116,7 +116,7 @@ function parse_url_content(&$a) {
}
if(strlen($text)) {
- $text = '<br /><br />' . $text;
+ $text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
}
echo sprintf($template,$url,($title) ? $title : $url,$text);