aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-16 01:03:53 -0700
committerfriendica <info@friendica.com>2012-08-16 01:03:53 -0700
commitadba0bd98ac8c3fd5d2210e5e14f6a3ebfb00cd4 (patch)
treecf1b741798c4b11789f84a6bbc708376f635a470
parenteb911443aaee63f414cd95de4dabf60e2f14a994 (diff)
downloadvolse-hubzilla-adba0bd98ac8c3fd5d2210e5e14f6a3ebfb00cd4.tar.gz
volse-hubzilla-adba0bd98ac8c3fd5d2210e5e14f6a3ebfb00cd4.tar.bz2
volse-hubzilla-adba0bd98ac8c3fd5d2210e5e14f6a3ebfb00cd4.zip
That's better
-rw-r--r--include/plugin.php2
-rw-r--r--mod/zregister.php3
-rw-r--r--view/js/mod_zregister.js2
-rw-r--r--view/tpl/js_strings.tpl2
4 files changed, 3 insertions, 6 deletions
diff --git a/include/plugin.php b/include/plugin.php
index 9555268f7..7202ccaa9 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -451,7 +451,7 @@ function format_js_if_exists($source) {
else
$path = theme_include($source);
if($path)
- return '<script src="' . z_root() . '/' . $source . '" ></script>' . "\r\n" ;
+ return '<script src="' . z_root() . '/' . $path . '" ></script>' . "\r\n" ;
}
diff --git a/mod/zregister.php b/mod/zregister.php
index da3bc9f36..6d29cdf59 100644
--- a/mod/zregister.php
+++ b/mod/zregister.php
@@ -1,5 +1,6 @@
<?php
+require_once('include/account.php');
function zregister_init(&$a) {
$a->page['template'] = 'full';
@@ -57,8 +58,6 @@ function zregister_post(&$a) {
break;
}
- require_once('include/account.php');
-
$arr = $_POST;
$arr['account_flags'] = $flags;
diff --git a/view/js/mod_zregister.js b/view/js/mod_zregister.js
index c9935e47f..6dcb4058c 100644
--- a/view/js/mod_zregister.js
+++ b/view/js/mod_zregister.js
@@ -27,5 +27,3 @@
}
});
});
-
-</script>
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 9e5fb77bd..a5f50b33f 100644
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -8,7 +8,7 @@
'showmore' : '$showmore',
'showfewer' : '$showfewer',
'pwshort' : '$pwshort',
- 'pwnomatch' : 'pwnomatch',
+ 'pwnomatch' : '$pwnomatch',
't01' : $t01,
't02' : $t02,