keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rev update

Browse source
This commit is contained in:
friendica 2012-09-02 01:47:04 -07:00
parent f88f0bf3f2
commit 39c7b34276
4 changed files with 466 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1451' ); define ( 'FRIENDICA_VERSION', '3.0.1453' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1154 ); define ( 'DB_UPDATE_VERSION', 1154 );

4
include/dba.php
View file

@ -78,7 +78,7 @@ class dba {
$this->error = ''; $this->error = '';
if ($a->config["system"]["db_log"] != "") if(x($a->config,'system') && x($a->config['system'],'db_log'))
$stamp1 = microtime(true); $stamp1 = microtime(true);
if($this->mysqli) if($this->mysqli)
@ -86,7 +86,7 @@ class dba {
else else
$result = @mysql_query($sql,$this->db); $result = @mysql_query($sql,$this->db);
if ($a->config["system"]["db_log"] != "") { if(x($a->config,'system') && x($a->config['system'],'db_log')) {
$stamp2 = microtime(true); $stamp2 = microtime(true);
$duration = round($stamp2-$stamp1, 3); $duration = round($stamp2-$stamp1, 3);
if ($duration > $a->config["system"]["db_loglimit"]) { if ($duration > $a->config["system"]["db_loglimit"]) {

3
mod/install.php
View file

@ -466,7 +466,6 @@ function load_database_rem($v, $i){
function load_database($db) { function load_database($db) {
$str = file_get_contents('database.sql'); $str = file_get_contents('database.sql');
// $str = array_reduce(explode("\n", $str),"load_database_rem","");
$arr = explode(';',$str); $arr = explode(';',$str);
$errors = false; $errors = false;
foreach($arr as $a) { foreach($arr as $a) {
@ -488,7 +487,7 @@ function what_next() {
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
.t('Please see the file "INSTALL.txt".') .t('Please see the file "INSTALL.txt".')
."</p><p>" ."</p><p>"
.t("Go to your new Firendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") .t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
."</p>"; ."</p>";
} }

827
util/messages.po
View file

File diff suppressed because it is too large Load diff