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

start on bug #227 - more to do

Browse source
This commit is contained in:
friendica 2011-11-25 22:41:50 -08:00
parent 6b93324c11
commit 0f4a42f550
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1175' ); define ( 'FRIENDICA_VERSION', '2.3.1176' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1105 ); define ( 'DB_UPDATE_VERSION', 1105 );

15
include/dba.php
View file

@ -36,11 +36,19 @@ class dba {
} }
} }
if(class_exists('mysqli')) {
$this->db = @new mysqli($server,$user,$pass,$db); $this->db = @new mysqli($server,$user,$pass,$db);
if(! mysqli_connect_errno()) { if(! mysqli_connect_errno()) {
$this->connected = true; $this->connected = true;
} }
}
else { else {
$this->db = mysql_connect($server,$user,$pass);
if($this->db && mysql_select_db($db,$this->db)) {
$this->connected = true;
}
}
if(! $this->connected) {
$this->db = null; $this->db = null;
if(! $install) if(! $install)
system_unavailable(); system_unavailable();
@ -56,14 +64,19 @@ class dba {
if((! $this->db) || (! $this->connected)) if((! $this->db) || (! $this->connected))
return false; return false;
if(class_exists('mysqli'))
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
else
$result = @mysql_query($sql,$this->db);
if($this->debug) { if($this->debug) {
$mesg = ''; $mesg = '';
if($this->db->errno) if(class_exists('mysqli') && $this->db->errno)
logger('dba: ' . $this->db->error); logger('dba: ' . $this->db->error);
else
logger('dba: ' . mysql_error($this->db));
if($result === false) if($result === false)
$mesg = 'false'; $mesg = 'false';

3
include/text.php
View file

@ -492,6 +492,9 @@ function get_tags($s) {
// ignore strictly numeric tags like #1 // ignore strictly numeric tags like #1
if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
continue; continue;
// try not to catch url fragments
if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))
continue;
$ret[] = $mtch; $ret[] = $mtch;
} }
} }

3
mod/events.php
View file

@ -228,6 +228,9 @@ function events_content(&$a) {
if($d !== $last_date) if($d !== $last_date)
$o .= '<hr /><a name="link-' . $j . '" ><div class="event-list-date">' . $d . '</div></a>'; $o .= '<hr /><a name="link-' . $j . '" ><div class="event-list-date">' . $d . '</div></a>';
$last_date = $d; $last_date = $d;
if($rr['author-name']) {
$o .= '<a href="' . $rr['author-link'] . '" ><img src="' . $rr['author-avatar'] . '" height="32" width="32" />' . $rr['author-name'] . '</a>';
}
$o .= format_event_html($rr); $o .= format_event_html($rr);
$o .= ((! $rr['cid']) ? '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>' : ''); $o .= ((! $rr['cid']) ? '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>' : '');
if($rr['plink']) if($rr['plink'])