GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

$_PEAR now defined globally as new PEAR, so no static calls are made

Browse Source
This commit is contained in:
Mikael Nordfeldth
2013-09-23 22:27:17 +02:00
parent 8205c56e25
commit 9d3abc3600
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/schema.php
View File

@@ -345,9 +345,11 @@ class Schema
public function dropTable($name)
{
global $_PEAR;
$res = $this->conn->query("DROP TABLE $name");
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -372,6 +374,8 @@ class Schema
public function createIndex($table, $columnNames, $name=null)
{
global $_PEAR;
if (!is_array($columnNames)) {
$columnNames = array($columnNames);
}
@@ -384,7 +388,7 @@ class Schema
"ADD INDEX $name (".
implode(",", $columnNames).")");
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -402,9 +406,11 @@ class Schema
public function dropIndex($table, $name)
{
global $_PEAR;
$res = $this->conn->query("ALTER TABLE $table DROP INDEX $name");
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -423,11 +429,13 @@ class Schema
public function addColumn($table, $columndef)
{
global $_PEAR;
$sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef);
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -447,12 +455,14 @@ class Schema
public function modifyColumn($table, $columndef)
{
global $_PEAR;
$sql = "ALTER TABLE $table MODIFY COLUMN " .
$this->_columnSql($columndef);
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -472,11 +482,13 @@ class Schema
public function dropColumn($table, $columnName)
{
global $_PEAR;
$sql = "ALTER TABLE $table DROP COLUMN $columnName";
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
@@ -513,6 +525,8 @@ class Schema
*/
function runSqlSet(array $statements)
{
global $_PEAR;
$ok = true;
foreach ($statements as $sql) {
if (defined('DEBUG_INSTALLER')) {
@@ -520,7 +534,7 @@ class Schema
}
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}
}
@@ -1027,8 +1041,10 @@ class Schema
*/
protected function fetchQueryData($sql)
{
global $_PEAR;
$res = $this->conn->query($sql);
if (PEAR::isError($res)) {
if ($_PEAR->isError($res)) {
throw new Exception($res->getMessage());
}