Home Esplora Aiuto
Registrati Accedi
Omnimaga
/
SMF2.1
mirror da [email protected]:Omnimaga/SMF2.1.git
2
0
Forka 0
File Problemi 0 Wiki
Sfoglia il codice sorgente

Merge pull request #628 from Oldiesmann/release-2.1

Fix a few bugs related to #623
Michael Eshom 10 anni fa
parent
5d80f7d464 13a40470f2
commit
996814e6db
5 ha cambiato i file con 5 aggiunte e 5 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1 1
      Sources/ManagePosts.php
  2. 1 1
      Themes/default/Admin.template.php
  3. 1 1
      other/upgrade_2-1_mysql.sql
  4. 1 1
      other/upgrade_2-1_postgresql.sql
  5. 1 1
      other/upgrade_2-1_sqlite.sql

+ 1 - 1
Sources/ManagePosts.php
Vedi File 

@@ -124,7 +124,7 @@ function SetCensor()
 
 		$updates = array(
 
 			'censor_vulgar' => implode("\n", $censored_vulgar),
 
 			'censor_proper' => implode("\n", $censored_proper),
 
-			'allow_no_censor' => empty($_POST['allow_no_censor']) ? '0' : '1',
 
+			'allow_no_censored' => empty($_POST['allow_no_censored']) ? '0' : '1',
 
 			'censorWholeWord' => empty($_POST['censorWholeWord']) ? '0' : '1',
 
 			'censorIgnoreCase' => empty($_POST['censorIgnoreCase']) ? '0' : '1',
 
 		);

+ 1 - 1
Themes/default/Admin.template.php
Vedi File 

@@ -584,7 +584,7 @@ function template_edit_censored()
 
 					<hr width="100%" size="1" class="hrcolor clear" />
 
 					<dl class="settings">
 
 						<dt>
 
-							<strong><label for="allow_no_ccensored">', $txt['allow_no_censored'], ':</label></strong>
 
+							<strong><label for="allow_no_censored">', $txt['allow_no_censored'], ':</label></strong>
 
 						</dt>
 
 						<dd>
 
 							<input type="checkbox" name="allow_no_censored" value="1" id="allow_no_censored"', empty($modSettings['allow_no_censored']) ? '' : ' checked="checked"', ' class="input_check" />

+ 1 - 1
other/upgrade_2-1_mysql.sql
Vedi File 

@@ -34,7 +34,7 @@ if (!isset($modSettings['allow_no_censor']))
 
 {
 
 	$request = upgrade_query("
 
 		SELECT value
 
-		FROM {$db_prefix}settings
 
+		FROM {$db_prefix}themes
 
 		WHERE variable='allow_no_censor'
 
 		AND id_theme = 1 OR id_theme = '$modSettings[theme_default]'
 
 	");

+ 1 - 1
other/upgrade_2-1_postgresql.sql
Vedi File 

@@ -36,7 +36,7 @@ if (!isset($modSettings['allow_no_censor']))
 
 {
 
 	$request = upgrade_query("
 
 		SELECT value
 
-		FROM {$db_prefix}settings
 
+		FROM {$db_prefix}themes
 
 		WHERE variable='allow_no_censor'
 
 		AND id_theme = 1 OR id_theme = '$modSettings[theme_default]'
 
 	");

+ 1 - 1
other/upgrade_2-1_sqlite.sql
Vedi File 

@@ -377,7 +377,7 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 
 ---{
 
 	$request = upgrade_query("
 
 		SELECT value
 
-		FROM {$db_prefix}settings
 
+		FROM {$db_prefix}themes
 
 		WHERE variable='allow_no_censor'
 
 		AND id_theme = 1 OR id_theme = '$modSettings[theme_default]'
 
 	");