Merge branch 'master' into master

miraheze · Aug 18, 2024 · 72d780f · 72d780f
2 parents 1e9ed9f + b194aea
commit 72d780f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/LocalSettings.php b/LocalSettings.php
@@ -1795,7 +1795,11 @@
 		'default' => 'rsvg',
 	],
 	'wgSVGConverterPath' => [
-		'default' => '/usr/local/bin'
+		'default' => '/usr/local/bin',
+	],
+	'wgSVGNativeRendering' => [
+		'default' => false,
+		'cloudstreamwiki' => true,
 	],
 	'wgUploadMissingFileUrl' => [
 		'default' => false,

diff --git a/LocalWiki.php b/LocalWiki.php
@@ -536,23 +536,6 @@ function onBeforePageDisplay( OutputPage $out ) {
 			$out->addMeta( 'viewport', 'width=device-width, initial-scale=1' );
 		}
 
-		break;
-	case 'spacewiki':
-		$wgExtraNamespaces += [
-			NS_TALK => 'talk',
-			NS_USER => 'user',
-			NS_USER_TALK => 'user-talk',
-			NS_FILE => 'file',
-			NS_FILE_TALK => 'file-talk',
-			NS_MEDIAWIKI => 'mediawiki',
-			NS_MEDIAWIKI_TALK => 'mediawiki-talk',
-			NS_TEMPLATE => 'template',
-			NS_TEMPLATE_TALK => 'template-talk',
-			NS_HELP => 'guide',
-			NS_HELP_TALK => 'guide-talk',
-			NS_CATEGORY => 'category',
-			NS_CATEGORY_TALK => 'category-talk'
-		];
 		break;
 	case 'srewiki':
 		wfLoadExtension( 'LdapAuthentication' );

diff --git a/ManageWikiExtensions.php b/ManageWikiExtensions.php
@@ -1496,7 +1496,7 @@
 		'requires' => [],
 		'install' => [
 			'sql' => [
-				'linter' => "$IP/extensions/Linter/sql/tables-generated.sql"
+				'linter' => "$IP/extensions/Linter/sql/mysql/tables-generated.sql"
 			],
 		],
 		'section' => 'specialpages',