diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dba.php | 23 | ||||
| -rw-r--r-- | include/text.php | 3 |
2 files changed, 21 insertions, 5 deletions
diff --git a/include/dba.php b/include/dba.php index 70c27515c..e9d47cd1a 100644 --- a/include/dba.php +++ b/include/dba.php @@ -36,11 +36,19 @@ class dba { } } - $this->db = @new mysqli($server,$user,$pass,$db); - if(! mysqli_connect_errno()) { - $this->connected = true; + if(class_exists('mysqli')) { + $this->db = @new mysqli($server,$user,$pass,$db); + if(! mysqli_connect_errno()) { + $this->connected = true; + } } 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; if(! $install) system_unavailable(); @@ -56,14 +64,19 @@ class dba { if((! $this->db) || (! $this->connected)) return false; - $result = @$this->db->query($sql); + if(class_exists('mysqli')) + $result = @$this->db->query($sql); + else + $result = @mysql_query($sql,$this->db); if($this->debug) { $mesg = ''; - if($this->db->errno) + if(class_exists('mysqli') && $this->db->errno) logger('dba: ' . $this->db->error); + else + logger('dba: ' . mysql_error($this->db)); if($result === false) $mesg = 'false'; diff --git a/include/text.php b/include/text.php index 08803cc9b..c4fd76e3e 100644 --- a/include/text.php +++ b/include/text.php @@ -492,6 +492,9 @@ function get_tags($s) { // ignore strictly numeric tags like #1 if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) 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; } } |