jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349760 )
Change subject: Fix bad newlines
......................................................................
Fix bad newlines
Removed \r from files
Change-Id: I2604dae4885c86e92313db499b5ef2c8286bdc24
---
M RelatedLinks.alias.php
M RelatedLinks.hooks.php
M extension.json
M modules/ext.related_links.css
M modules/ext.related_links.js
5 files changed, 199 insertions(+), 199 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RelatedLinks.alias.php b/RelatedLinks.alias.php
index c6d0d29..3dc8a76 100755
--- a/RelatedLinks.alias.php
+++ b/RelatedLinks.alias.php
@@ -1,19 +1,19 @@
-<?php
-/**
- * Aliases for myextension
- *
- * @file
- * @ingroup Extensions
- */
-
-$specialPageAliases = array();
-
-/** English
- * @author SleepingLion
- */
-$specialPageAliases['en'] = array('RelatedLinks' => array('RelatedLinks',
'Related Links'));
-
-/** korean
- * @author SleepingLion
- */
-$specialPageAliases['ko'] = array('RelatedLinks' => array('연관사이트', '연관 사이트'));
+<?php
+/**
+ * Aliases for myextension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$specialPageAliases = array();
+
+/** English
+ * @author SleepingLion
+ */
+$specialPageAliases['en'] = array('RelatedLinks' => array('RelatedLinks',
'Related Links'));
+
+/** korean
+ * @author SleepingLion
+ */
+$specialPageAliases['ko'] = array('RelatedLinks' => array('연관사이트', '연관 사이트'));
diff --git a/RelatedLinks.hooks.php b/RelatedLinks.hooks.php
index f587211..e9df922 100755
--- a/RelatedLinks.hooks.php
+++ b/RelatedLinks.hooks.php
@@ -1,83 +1,83 @@
-<?php
-/**
- * Hooks for RelatedLinks extension
- *
- * @file
- * @ingroup Extensions
- */
-
-function initiateSettingsForRelatedLinks() {
- $dbw = wfGetDB( DB_MASTER );
- $query = "CREATE TABLE " . $dbw->tableName( 'related_links' )
. " ( " .
- " `id` INT(11) NOT NULL AUTO_INCREMENT, " .
- " `user_id` INT(11) NOT NULL DEFAULT 0, " .
- " `links_id` VARCHAR(50) NOT NULL DEFAULT '', " .
- " `links_order` TINYINT(3) NOT NULL DEFAULT 0, " .
- " `links_subject` VARCHAR(60) NOT NULL DEFAULT '', " .
- " `links_url` VARCHAR(255) NOT NULL DEFAULT '', " .
- " `links_enable` ENUM( 'true', 'false' ) NOT NULL DEFAULT
'true', " .
- " `links_datetime` DATETIME NOT NULL DEFAULT '0000-00-00
00:00:00', " .
- " `links_import_domain` VARCHAR(50) NOT NULL DEFAULT '',
" .
- " PRIMARY KEY (`id`), " .
- " UNIQUE KEY (`user_id`, `links_id`, `links_url`), " .
- " KEY index_sort (`links_id`, `links_order`), " .
- " KEY index_enable (`user_id`, `links_enable`) " .
- ")";
- return $dbw->query( $query );
-}
-
-class RelatedLinksHooks
-{
- /*
- * Draw Related Links Management
- */
- public static function SkinTemplateToolboxEnd($this) {
- $dbr = wfGetDB( DB_SLAVE );
-
- if ($dbr->tableExists( 'related_links' )) {
- $tbl_links = $dbr->tableName( 'related_links' );
- } else {
- $result = initiateSettingsForRelatedLinks();
-
- if (!$result ) {
- die( 'Failed to create table Related Links' );
- }
- $tbl_links = $dbr->tableName( 'related_links' );
- }
-
- $links_id = filter_var($_GET['title'],FILTER_SANITIZE_STRING);
-
- $fields = array( 'links_subject', 'links_url' );
- $conds = array('user_id'=> '','links_enable' =>
'true','links_id'=> $links_id);
- $opts = array( 'ORDER BY' => 'links_order' );
- $result = $dbr->select( $tbl_links, $fields, $conds,
'Database::select', $opts );
- $rows = $dbr->numRows( $result );
-?>
-</ul>
-</div>
-</div>
-<div class="portlet" id="p-relatedlinks">
-<h3>
-<?php echo wfMessage( 'relatedlinks' ) ?>
-[<a href="<?php echo ( SkinTemplate::makeSpecialUrl( 'relatedlinks' ) . '/' .
$links_id )?>"><?php echo wfMessage( 'edit' ) ?></a>]
-</h3>
-<div class="pBody">
-<ul>
-<?php while ( $row = $dbr->fetchObject( $result ) ) { ?>
-<li id="related-<?php echo $links_id?>"><a href="<?php echo htmlspecialchars(
$row->links_url )?>" target="_blank"><?php echo $row->links_subject?></a></li>
-<?php } ?>
-
-<?php
-if ( !$rows )
-{
-?>
-<li id="related-<?php echo $links_id?>"><?php echo wfMessage( 'no_link' )
?></li>
-<?php
-}
-
- return true;
- }
-}
-
-
-
+<?php
+/**
+ * Hooks for RelatedLinks extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+function initiateSettingsForRelatedLinks() {
+ $dbw = wfGetDB( DB_MASTER );
+ $query = "CREATE TABLE " . $dbw->tableName( 'related_links' )
. " ( " .
+ " `id` INT(11) NOT NULL AUTO_INCREMENT, " .
+ " `user_id` INT(11) NOT NULL DEFAULT 0, " .
+ " `links_id` VARCHAR(50) NOT NULL DEFAULT '', " .
+ " `links_order` TINYINT(3) NOT NULL DEFAULT 0, " .
+ " `links_subject` VARCHAR(60) NOT NULL DEFAULT '', " .
+ " `links_url` VARCHAR(255) NOT NULL DEFAULT '', " .
+ " `links_enable` ENUM( 'true', 'false' ) NOT NULL DEFAULT
'true', " .
+ " `links_datetime` DATETIME NOT NULL DEFAULT '0000-00-00
00:00:00', " .
+ " `links_import_domain` VARCHAR(50) NOT NULL DEFAULT '',
" .
+ " PRIMARY KEY (`id`), " .
+ " UNIQUE KEY (`user_id`, `links_id`, `links_url`), " .
+ " KEY index_sort (`links_id`, `links_order`), " .
+ " KEY index_enable (`user_id`, `links_enable`) " .
+ ")";
+ return $dbw->query( $query );
+}
+
+class RelatedLinksHooks
+{
+ /*
+ * Draw Related Links Management
+ */
+ public static function SkinTemplateToolboxEnd($this) {
+ $dbr = wfGetDB( DB_SLAVE );
+
+ if ($dbr->tableExists( 'related_links' )) {
+ $tbl_links = $dbr->tableName( 'related_links' );
+ } else {
+ $result = initiateSettingsForRelatedLinks();
+
+ if (!$result ) {
+ die( 'Failed to create table Related Links' );
+ }
+ $tbl_links = $dbr->tableName( 'related_links' );
+ }
+
+ $links_id = filter_var($_GET['title'],FILTER_SANITIZE_STRING);
+
+ $fields = array( 'links_subject', 'links_url' );
+ $conds = array('user_id'=> '','links_enable' =>
'true','links_id'=> $links_id);
+ $opts = array( 'ORDER BY' => 'links_order' );
+ $result = $dbr->select( $tbl_links, $fields, $conds,
'Database::select', $opts );
+ $rows = $dbr->numRows( $result );
+?>
+</ul>
+</div>
+</div>
+<div class="portlet" id="p-relatedlinks">
+<h3>
+<?php echo wfMessage( 'relatedlinks' ) ?>
+[<a href="<?php echo ( SkinTemplate::makeSpecialUrl( 'relatedlinks' ) . '/' .
$links_id )?>"><?php echo wfMessage( 'edit' ) ?></a>]
+</h3>
+<div class="pBody">
+<ul>
+<?php while ( $row = $dbr->fetchObject( $result ) ) { ?>
+<li id="related-<?php echo $links_id?>"><a href="<?php echo htmlspecialchars(
$row->links_url )?>" target="_blank"><?php echo $row->links_subject?></a></li>
+<?php } ?>
+
+<?php
+if ( !$rows )
+{
+?>
+<li id="related-<?php echo $links_id?>"><?php echo wfMessage( 'no_link' )
?></li>
+<?php
+}
+
+ return true;
+ }
+}
+
+
+
diff --git a/extension.json b/extension.json
index a9deccd..a65c9fa 100755
--- a/extension.json
+++ b/extension.json
@@ -1,39 +1,39 @@
-{
- "name": "RelatedLinks",
- "author": "Sleeping-Lion",
- "version": "1.0.0",
- "url": "https://www.mediawiki.org/wiki/Extension:RelatedLinks";,
- "descriptionmsg": "relatedlinks-desc",
- "type": "specialpage",
- "license-name": "MIT",
- "requires": {
- "MediaWiki": ">= 1.25.0"
- },
- "ResourceModules": {
- "ext.relatedLinks": {
- "scripts": "ext.related_links.js",
- "styles": "ext.related_links.css"
- }
- },
- "ResourceFileModulePaths": {
- "localBasePath": "modules",
- "remoteExtPath": "RelatedLinks/modules"
- },
- "Hooks": {
- "MonoBookTemplateToolboxEnd":
["RelatedLinksHooks::SkinTemplateToolboxEnd"]
- },
- "ExtensionMessagesFiles": {
- "RelatedLinksAlias": "RelatedLinks.alias.php"
- },
- "MessagesDirs": {
- "RelatedLinks": ["i18n"]
- },
- "SpecialPages": {
- "RelatedLinks": "SpecialRelatedLinks"
- },
- "AutoloadClasses": {
- "RelatedLinksHooks": "RelatedLinks.hooks.php",
- "SpecialRelatedLinks": "SpecialRelatedLinks.php"
- },
- "manifest_version": 1
-}
+{
+ "name": "RelatedLinks",
+ "author": "Sleeping-Lion",
+ "version": "1.0.0",
+ "url": "https://www.mediawiki.org/wiki/Extension:RelatedLinks";,
+ "descriptionmsg": "relatedlinks-desc",
+ "type": "specialpage",
+ "license-name": "MIT",
+ "requires": {
+ "MediaWiki": ">= 1.25.0"
+ },
+ "ResourceModules": {
+ "ext.relatedLinks": {
+ "scripts": "ext.related_links.js",
+ "styles": "ext.related_links.css"
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "modules",
+ "remoteExtPath": "RelatedLinks/modules"
+ },
+ "Hooks": {
+ "MonoBookTemplateToolboxEnd":
["RelatedLinksHooks::SkinTemplateToolboxEnd"]
+ },
+ "ExtensionMessagesFiles": {
+ "RelatedLinksAlias": "RelatedLinks.alias.php"
+ },
+ "MessagesDirs": {
+ "RelatedLinks": ["i18n"]
+ },
+ "SpecialPages": {
+ "RelatedLinks": "SpecialRelatedLinks"
+ },
+ "AutoloadClasses": {
+ "RelatedLinksHooks": "RelatedLinks.hooks.php",
+ "SpecialRelatedLinks": "SpecialRelatedLinks.php"
+ },
+ "manifest_version": 1
+}
diff --git a/modules/ext.related_links.css b/modules/ext.related_links.css
index 7611b6f..4ba3a03 100755
--- a/modules/ext.related_links.css
+++ b/modules/ext.related_links.css
@@ -1,22 +1,22 @@
-table.lieTable {
- border-top: 2px solid #79d;
- border-bottom: 2px solid #79d;
- border-collapse: collapse;
-}
-
-table.lieTable th {
- padding: 3px;
- border-bottom: 1px solid #8ae;
- background: #dfefff;
-}
-
-table.lieTable td {
- padding: 3px;
- border-bottom: 1px solid #8ae;
- text-align: center;
-}
-
-.s_order {
- width: 30px;
- text-align: right;
+table.lieTable {
+ border-top: 2px solid #79d;
+ border-bottom: 2px solid #79d;
+ border-collapse: collapse;
+}
+
+table.lieTable th {
+ padding: 3px;
+ border-bottom: 1px solid #8ae;
+ background: #dfefff;
+}
+
+table.lieTable td {
+ padding: 3px;
+ border-bottom: 1px solid #8ae;
+ text-align: center;
+}
+
+.s_order {
+ width: 30px;
+ text-align: right;
}
\ No newline at end of file
diff --git a/modules/ext.related_links.js b/modules/ext.related_links.js
index e7158a8..d0ab98b 100755
--- a/modules/ext.related_links.js
+++ b/modules/ext.related_links.js
@@ -1,37 +1,37 @@
-$(document).ready(function(){
- $('#checkall').click(function () {
- if($(this).is(':checked')) {
- $('input.checkitem').prop('checked',true);
- } else {
- $('input.checkitem').prop('checked',false);
- }
- });
-
- $('#btn_delete-sidebar').click(function () {
- if(isSelected() == true ) {
- $('#submit_type').val('DELETE');
- $('#related_links_form' ).submit();
- } else {
- alert( 'Select items..' );
- }
- });
-
- $('#btn_insert-sidebar').click(function () {
- if($('#new_subject' ).val() && $('#new_url').val()) {
- $('#submit_type' ).val('INSERT');
- $('#related_links_form').submit();
- } else {
- alert( 'Input data..' );
- }
- });
-});
-
-function isSelected () {
- var is_checked = false;
-
- $('input.checkitem').each(function() {
- if($(this).is(':checked'))
- is_checked=true;
- });
- return is_checked;
-}
+$(document).ready(function(){
+ $('#checkall').click(function () {
+ if($(this).is(':checked')) {
+ $('input.checkitem').prop('checked',true);
+ } else {
+ $('input.checkitem').prop('checked',false);
+ }
+ });
+
+ $('#btn_delete-sidebar').click(function () {
+ if(isSelected() == true ) {
+ $('#submit_type').val('DELETE');
+ $('#related_links_form' ).submit();
+ } else {
+ alert( 'Select items..' );
+ }
+ });
+
+ $('#btn_insert-sidebar').click(function () {
+ if($('#new_subject' ).val() && $('#new_url').val()) {
+ $('#submit_type' ).val('INSERT');
+ $('#related_links_form').submit();
+ } else {
+ alert( 'Input data..' );
+ }
+ });
+});
+
+function isSelected () {
+ var is_checked = false;
+
+ $('input.checkitem').each(function() {
+ if($(this).is(':checked'))
+ is_checked=true;
+ });
+ return is_checked;
+}
--
To view, visit https://gerrit.wikimedia.org/r/349760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2604dae4885c86e92313db499b5ef2c8286bdc24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedLinks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
