dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes I14044f14,Idd9eff2f,I6535467e
[lhc/web/wiklou.git]
/
maintenance
/
sqlite.inc
diff --git
a/maintenance/sqlite.inc
b/maintenance/sqlite.inc
index
16568ac
..
08188ca
100644
(file)
--- a/
maintenance/sqlite.inc
+++ b/
maintenance/sqlite.inc
@@
-33,10
+33,7
@@
class Sqlite {
* @return bool
*/
public static function isPresent() {
* @return bool
*/
public static function isPresent() {
- wfSuppressWarnings();
- $compiled = wfDl( 'pdo_sqlite' );
- wfRestoreWarnings();
- return $compiled;
+ return extension_loaded( 'pdo_sqlite' );
}
/**
}
/**
@@
-73,7
+70,9
@@
class Sqlite {
$tables = $db->query( "SELECT name FROM sqlite_master WHERE type='table'", __METHOD__ );
foreach ( $tables as $table ) {
$tables = $db->query( "SELECT name FROM sqlite_master WHERE type='table'", __METHOD__ );
foreach ( $tables as $table ) {
- if ( strpos( $table->name, 'sqlite_' ) === 0 ) continue;
+ if ( strpos( $table->name, 'sqlite_' ) === 0 ) {
+ continue;
+ }
$columns = $db->query( "PRAGMA table_info({$table->name})", __METHOD__ );
foreach ( $columns as $col ) {
$columns = $db->query( "PRAGMA table_info({$table->name})", __METHOD__ );
foreach ( $columns as $col ) {
@@
-89,4
+88,4
@@
class Sqlite {
$db->close();
return true;
}
$db->close();
return true;
}
-
};
+};