aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-03 15:54:50 +0100
committermarijus <mario@localhost.localdomain>2014-02-03 15:54:50 +0100
commit2a9baa1f325b62541ad7a7b68e91455b104677bd (patch)
treee82a3d62a58f41444737f06fd81af737aea77c2e
parent5c885e91a36bdbdd0829c2950b54bb84288e05a9 (diff)
parent6c91580716524e03d68d6d3c95f0fa38b91a1362 (diff)
downloadvolse-hubzilla-2a9baa1f325b62541ad7a7b68e91455b104677bd.tar.gz
volse-hubzilla-2a9baa1f325b62541ad7a7b68e91455b104677bd.tar.bz2
volse-hubzilla-2a9baa1f325b62541ad7a7b68e91455b104677bd.zip
Merge branch 'master' of https://github.com/friendica/red
-rwxr-xr-xinclude/text.php36
-rw-r--r--version.inc2
2 files changed, 1 insertions, 37 deletions
diff --git a/include/text.php b/include/text.php
index 1eef4e37a..a72989147 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1516,20 +1516,6 @@ function return_bytes ($size_str) {
}
}
-function generate_user_guid() {
- $found = true;
- do {
- $guid = random_string(16);
- $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
- dbesc($guid)
- );
- if(! count($x))
- $found = false;
- } while ($found == true );
- return $guid;
-}
-
-
function base64url_encode($s, $strip_padding = true) {
@@ -1547,23 +1533,6 @@ function base64url_decode($s) {
logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true));
return $s;
}
-
-/*
- * // Placeholder for new rev of salmon which strips base64 padding.
- * // PHP base64_decode handles the un-padded input without requiring this step
- * // Uncomment if you find you need it.
- *
- * $l = strlen($s);
- * if(! strpos($s,'=')) {
- * $m = $l % 4;
- * if($m == 2)
- * $s .= '==';
- * if($m == 3)
- * $s .= '=';
- * }
- *
- */
-
return base64_decode(strtr($s,'-_','+/'));
}
@@ -1668,11 +1637,6 @@ function item_post_type($item) {
}
-function normalise_openid($s) {
- return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
-}
-
-
function undo_post_tagging($s) {
$matches = null;
$cnt = preg_match_all('/([@#])\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
diff --git a/version.inc b/version.inc
index 4b99b62b1..09dce8eca 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-02.576
+2014-02-03.577