diff options
| -rw-r--r-- | includes/classes/class_stats.php | 8 | ||||
| -rw-r--r-- | includes/functions/functions_export.php | 4 | ||||
| -rw-r--r-- | modules/googlemap/places.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/includes/classes/class_stats.php b/includes/classes/class_stats.php index 374538c587..a01a758636 100644 --- a/includes/classes/class_stats.php +++ b/includes/classes/class_stats.php @@ -981,13 +981,13 @@ class stats { if ($fact) { if ($what=='INDI') { $rows= - WT_DB::prepare("SELECT i_gedcom AS ged FROM ${TBLPREFIX}individuals WHERE i_file=?") + WT_DB::prepare("SELECT i_gedcom AS ged FROM {$TBLPREFIX}individuals WHERE i_file=?") ->execute(array($this->_ged_id)) ->fetchAll(); } else if ($what=='FAM') { $rows= - WT_DB::prepare("SELECT f_gedcom AS ged FROM ${TBLPREFIX}families WHERE f_file=?") + WT_DB::prepare("SELECT f_gedcom AS ged FROM {$TBLPREFIX}families WHERE f_file=?") ->execute(array($this->_ged_id)) ->fetchAll(); } @@ -2780,7 +2780,7 @@ class stats { function totalMarriedMales() { global $TBLPREFIX; - $rows = WT_DB::prepare("SELECT f_gedcom AS ged, f_husb AS husb FROM ${TBLPREFIX}families WHERE f_file=?") + $rows = WT_DB::prepare("SELECT f_gedcom AS ged, f_husb AS husb FROM {$TBLPREFIX}families WHERE f_file=?") ->execute(array($this->_ged_id)) ->fetchAll(); $husb = array(); @@ -2796,7 +2796,7 @@ class stats { function totalMarriedFemales() { global $TBLPREFIX; - $rows = WT_DB::prepare("SELECT f_gedcom AS ged, f_wife AS wife FROM ${TBLPREFIX}families WHERE f_file=?") + $rows = WT_DB::prepare("SELECT f_gedcom AS ged, f_wife AS wife FROM {$TBLPREFIX}families WHERE f_file=?") ->execute(array($this->_ged_id)) ->fetchAll(); $wife = array(); diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php index 6d95f0b0e7..c70ab1b6ef 100644 --- a/includes/functions/functions_export.php +++ b/includes/functions/functions_export.php @@ -137,14 +137,14 @@ function gedcom_header($gedfile) { } // Link to SUBM/SUBN records, if they exist $subn= - WT_DB::prepare("SELECT o_id FROM ${TBLPREFIX}other WHERE o_type=? AND o_file=?") + WT_DB::prepare("SELECT o_id FROM {$TBLPREFIX}other WHERE o_type=? AND o_file=?") ->execute(array('SUBN', $ged_id)) ->fetchOne(); if ($subn) { $SUBN="\n1 SUBN @{$subn}@"; } $subm= - WT_DB::prepare("SELECT o_id FROM ${TBLPREFIX}other WHERE o_type=? AND o_file=?") + WT_DB::prepare("SELECT o_id FROM {$TBLPREFIX}other WHERE o_type=? AND o_file=?") ->execute(array('SUBM', $ged_id)) ->fetchOne(); if ($subm) { diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php index 1e0a0ef1cc..ad6904918d 100644 --- a/modules/googlemap/places.php +++ b/modules/googlemap/places.php @@ -198,11 +198,11 @@ if ($action=="ImportGedcom") { $j=0; if ($mode=="all") { $statement= - WT_DB::prepare("SELECT i_gedcom FROM ${TBLPREFIX}individuals UNION ALL SELECT f_gedcom FROM ${TBLPREFIX}families") + WT_DB::prepare("SELECT i_gedcom FROM {$TBLPREFIX}individuals UNION ALL SELECT f_gedcom FROM {$TBLPREFIX}families") ->execute(); } else { $statement= - WT_DB::prepare("SELECT i_gedcom FROM ${TBLPREFIX}individuals WHERE i_file=? UNION ALL SELECT f_gedcom FROM ${TBLPREFIX}families WHERE f_file=?") + WT_DB::prepare("SELECT i_gedcom FROM {$TBLPREFIX}individuals WHERE i_file=? UNION ALL SELECT f_gedcom FROM {$TBLPREFIX}families WHERE f_file=?") ->execute(array(WT_GED_ID, WT_GED_ID)); } while ($gedrec=$statement->fetchColumn()) { |