aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-02 12:49:00 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-02 12:49:00 -0400
commit02dc116a9c646ea5683b8df199a7ff492ae6cfcb (patch)
treeae81849bd1bcd92acd2040cb65e3b193ec5aabb8 /boot.php
parentb3680c0d266f06d2474cb45750b0486d246a8315 (diff)
parent6875f54647cbbdb66e6d570cbf357a8b83644fad (diff)
downloadvolse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.tar.gz
volse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.tar.bz2
volse-hubzilla-02dc116a9c646ea5683b8df199a7ff492ae6cfcb.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box diabook-theme: tryied to improve performance a bit diabook-theme: fix footer/impressum missing param provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. delineate the new profile changes from the rest of the text how did that happen? shuffle results of remote_common_friends widget only validate once perform basic validation * master:
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index e1687030d..f357487b9 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1329' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1142 );
+define ( 'DB_UPDATE_VERSION', 1143 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -1520,9 +1520,12 @@ function get_my_url() {
}
function zrl_init(&$a) {
- proc_run('php','include/gprobe.php',bin2hex(get_my_url()));
- $arr = array('zrl' => get_my_url(), 'url' => $a->cmd);
- call_hooks('zrl_init',$arr);
+ $tmp_str = get_my_url();
+ if(validate_url($tmp_str)) {
+ proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+ $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
+ call_hooks('zrl_init',$arr);
+ }
}
function zrl($s,$force = false) {