Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next

This commit is contained in:
Sebastian Grewe 2013-06-28 15:49:22 +02:00
commit f3fce2fec6
2 changed files with 1 additions and 4 deletions

View File

@ -184,7 +184,7 @@ class Statistics {
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
SUM(IF(our_result='Y', 1, 0)) AS valid, SUM(IF(our_result='Y', 1, 0)) AS valid,
SUM(IF(our_result='N', 1, 0)) SUM(IF(our_result='N', 1, 0)) AS invalid,
FROM " . $this->share->getTableName() . " AS s, FROM " . $this->share->getTableName() . " AS s,
" . $this->user->getTableName() . " AS u " . $this->user->getTableName() . " AS u
WHERE WHERE

View File

@ -2,9 +2,6 @@
// Make sure we are called from index.php // Make sure we are called from index.php
if (!defined('SECURITY')) die('Hacking attempt'); if (!defined('SECURITY')) die('Hacking attempt');
// What is our overall theme
define('THEME', 'mmcFE');
// Our include directory for additional features // Our include directory for additional features
define('INCLUDE_DIR', BASEPATH . 'include'); define('INCLUDE_DIR', BASEPATH . 'include');