projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated en_US-demo.sql and en_US-new.sql COAs (moved dates 1 year forwards)
[fa-stable.git]
/
includes
/
main.inc
diff --git
a/includes/main.inc
b/includes/main.inc
index bd2463f0cc549e0cbf24e4dd9941cb89c9a312d8..be058ed9293306e1fa933b09b09a1df1b8dd218d 100644
(file)
--- a/
includes/main.inc
+++ b/
includes/main.inc
@@
-179,6
+179,9
@@
function js_compress($sJS)
//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
$len = strlen($line);
//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
$len = strlen($line);
+ if (version_compare(PHP_VERSION, '7.0.0') >= 0) // uninitialized string offser error fix. @Braath Waate
+ $line .= chr(32);
+
for($j=0;$j<$len;$j++)
{
$c = $line[$j]; // this is _really_ faster than subst
for($j=0;$j<$len;$j++)
{
$c = $line[$j]; // this is _really_ faster than subst
@@
-439,7
+442,7
@@
function random_id($strength = 128)
for($i=0; $i < $n; $i++)
$bin .= chr(mt_rand(0, 255)); // Mersene Twister generator
}
for($i=0; $i < $n; $i++)
$bin .= chr(mt_rand(0, 255)); // Mersene Twister generator
}
- $id = strtr(base64_encode($bin), '+/
', '-_');
// see RFC 4648 Section 5
+ $id = strtr(base64_encode($bin), '+/
=', '-_x');
// see RFC 4648 Section 5
return $id;
}
return $id;
}