X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-optimize.php;h=85a1ac0244661a631eab6053ebf886780d153bf4;hb=4b9887f734067dc52a1730468e25ba066036a3e1;hp=68724755f3202aaada2765cd1899c5c1eb575e00;hpb=4328a215de9cdf89587a9399ce1e87878702c7a0;p=mailer.git

diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 68724755f3..85a1ac0244 100644
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -57,17 +57,16 @@ foreach ($DATA['tables'] as $row_array) {
 	// Fixes a bug which causes a parser error on eval'd code
 	if (empty($row_array[1])) $row_array[1] = 'NONE';
 
-	// Get optimization status
-	$REP = '{--OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
-
-	$OPT = '{--OPTIMIZE_STATUS_UNSUPPORTED--}';
+	// Get repair/optimization status
+	$repairStatus = '{--ADMIN_OPTIMIZE_STATUS_' . str_replace('__', '_', str_replace(',', '', str_replace('+', '', str_replace("'", '', str_replace(' ', '_', strtoupper($row_array[1])))))) . '--}';
+	$optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_UNSUPPORTED--}';
 
 	if ($row_array[4] > 0) {
-		$OPT = '{--OPTIMIZE_STATUS_OPTIMIZED--}';
+		$optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_OPTIMIZED--}';
 		$B1 = '<strong>'; $B2 = '<strong>';
 		$gain_tabs++;
 	} elseif (count(explode(' ', $row_array[2])) == 0) {
-		$OPT = '{--OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
+		$optimizeStatus = '{--ADMIN_OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
 	}
 
 	// Prepare data for the row template
@@ -75,8 +74,8 @@ foreach ($DATA['tables'] as $row_array) {
 		'b1'  => $B1,
 		'b2'  => $B2,
 		'tpl' => $row_array[0],
-		'rep' => $REP,
-		'opt' => $OPT,
+		'rep' => $repairStatus,
+		'opt' => $optimizeStatus,
 		'sum' => $row_array[3],
 		'sav' => $row_array[4],
 	);
@@ -85,12 +84,14 @@ foreach ($DATA['tables'] as $row_array) {
 	$OUT .= loadTemplate('admin_optimize_row', true, $content);
 } // END - foreach
 
+// Transfer main data
+$content = $DATA;
+
 // Remember rows
 $content['rows'] = $OUT;
 
 // Transfer data to $content for template
-$content = merge_array($content, $DATA);
-$content['now_optimized']   = $gain_tabs;
+$content['now_optimized'] = $gain_tabs;
 
 // Load main template
 loadTemplate('admin_optimize', false, $content);