james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix un-necessary PHP Notices being generated in the error log files.

Browse Source
This commit is contained in:
jgen 2014-02-21 20:36:19 -05:00
parent e0bf45788e
commit 43f59cc4c0
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -37,7 +37,9 @@ after_failure:
- sudo cat /etc/nginx/sites-enabled/default - sudo cat /etc/nginx/sites-enabled/default
- sudo cat /var/log/nginx/error.log - sudo cat /var/log/nginx/error.log
- sudo cat /var/log/php5-fpm.log - sudo cat /var/log/php5-fpm.log
- sudo cat /var/log/*mysql* - sudo ls /var/run/mysql*
- sudo ls /var/log/*mysql*
- sudo cat /var/log/mysql
# configure notifications (email, IRC, campfire etc) # configure notifications (email, IRC, campfire etc)
#notifications: #notifications:

2
core/util.inc.php
View File

@ -600,7 +600,7 @@ $_execs = 0;
*/ */
function _count_execs($db, $sql, $inputarray) { function _count_execs($db, $sql, $inputarray) {
global $_execs; global $_execs;
if ((defined(DEBUG_SQL) && DEBUG_SQL === true) || (is_null(DEBUG_SQL) && @$_GET['DEBUG_SQL'])) { if (defined(DEBUG_SQL) && (DEBUG_SQL === true || (is_null(DEBUG_SQL) && @$_GET['DEBUG_SQL'])) {
$fp = @fopen("data/sql.log", "a"); $fp = @fopen("data/sql.log", "a");
if($fp) { if($fp) {
if(isset($inputarray) && is_array($inputarray)) { if(isset($inputarray) && is_array($inputarray)) {

2
install.php
View File

@ -123,10 +123,12 @@ function do_install() { // {{{
} }
else if(@$_POST["database_type"] == "sqlite" && isset($_POST["database_name"])) { else if(@$_POST["database_type"] == "sqlite" && isset($_POST["database_name"])) {
define('DATABASE_DSN', "sqlite:{$_POST["database_name"]}"); define('DATABASE_DSN', "sqlite:{$_POST["database_name"]}");
define("DATABASE_KA", true); // Keep database connection alive
install_process(); install_process();
} }
else if(isset($_POST['database_type']) && isset($_POST['database_host']) && isset($_POST['database_user']) && isset($_POST['database_name'])) { else if(isset($_POST['database_type']) && isset($_POST['database_host']) && isset($_POST['database_user']) && isset($_POST['database_name'])) {
define('DATABASE_DSN', "{$_POST['database_type']}:user={$_POST['database_user']};password={$_POST['database_password']};host={$_POST['database_host']};dbname={$_POST['database_name']}"); define('DATABASE_DSN', "{$_POST['database_type']}:user={$_POST['database_user']};password={$_POST['database_password']};host={$_POST['database_host']};dbname={$_POST['database_name']}");
define("DATABASE_KA", true); // Keep database connection alive
install_process(); install_process();
} }
else { else {

2
tests/test_install.php
View File

@ -51,6 +51,8 @@ class ShimmieInstallerTest extends WebTestCase {
} elseif ($db === "pgsql") { } elseif ($db === "pgsql") {
$this->setField("database_user", "postgres"); $this->setField("database_user", "postgres");
$this->setField("database_password", ""); $this->setField("database_password", "");
} else {
die("Unsupported Database Option");
} }
$this->assertField("database_name", "shimmie"); $this->assertField("database_name", "shimmie");