Pigpen has submitted this change and it was merged.
Change subject: Added WMF git ignores; latest updates
......................................................................
Added WMF git ignores; latest updates
Change-Id: Icf0c68ea9e9f9c89b31caf32ecc0a787e3fceb5b
---
M .gitignore
M Blog/Blog.class.php
M UEModulePDF/UEModulePDF.class.php
M VisualEditor/resources/tinymce.startup.js
4 files changed, 28 insertions(+), 23 deletions(-)
Approvals:
Pigpen: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 619617a..b7e5dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+.svn
+*~
+*.kate-swp
+.*.swp
BlueSpiceExtensions.php
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 6f6be0a..1fea228 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -106,31 +106,29 @@
$this->setHook( 'BeforePageDisplay' );
// Trackback is not fully functional in MW and thus disabled.
- BsConfig::registerVar('MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL,
'bs-blog-pref-ShowTrackback');
+ BsConfig::registerVar('MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowTrackback');
// Show permalink link at end of a blog entry
- BsConfig::registerVar('MW::Blog::ShowPermalink', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL,
'bs-blog-pref-ShowPermalink', 'toggle');
+ BsConfig::registerVar('MW::Blog::ShowPermalink', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowPermalink',
'toggle');
// Show info line below blog entry heading
- BsConfig::registerVar('MW::Blog::ShowInfo',
true, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL,
'bs-blog-pref-ShowInfo', 'toggle');
+ BsConfig::registerVar('MW::Blog::ShowInfo', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowInfo', 'toggle');
// Open more link in new window
- BsConfig::registerVar('MW::Blog::MoreInNewWindow', false,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL,
'bs-blog-pref-MoreInNewWindow', 'toggle');
+ BsConfig::registerVar('MW::Blog::MoreInNewWindow', false,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-MoreInNewWindow',
'toggle');
// Should a link to complete list of blog entries be rendered?
- BsConfig::registerVar('MW::Blog::ShowAll',
true, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL,
'bs-blog-pref-ShowAll', 'toggle');
+ BsConfig::registerVar('MW::Blog::ShowAll', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowAll', 'toggle');
// Place more link at end of blog entry instead of next line
- BsConfig::registerVar('MW::Blog::MoreAtEndOfEntry', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL,
'bs-blog-pref-MoreAtEndOfEntry', 'toggle');
+ BsConfig::registerVar('MW::Blog::MoreAtEndOfEntry', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-MoreAtEndOfEntry',
'toggle');
// Possible values are "creation" and "title"
//BsConfig::registerVar('MW::Blog::SortBy',
'creation', BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, $this->mI18N);
BsConfig::registerVar( 'MW::Blog::SortBy', 'creation',
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-blog-pref-SortBy', 'select' );
// Number of blog entries that shall be displayed initially
- BsConfig::registerVar('MW::Blog::ShowLimit', 10,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,
'bs-blog-pref-ShowLimit', 'int');
- // Namespace blog entries are taken from
- BsConfig::registerVar('MW::Blog::Ns',
102, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-Ns',
'int');
+ BsConfig::registerVar('MW::Blog::ShowLimit', 10,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-ShowLimit', 'int');
// Show form that allows to create a new blog entry
- BsConfig::registerVar('MW::Blog::ShowNewEntryField', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowNewEntryField',
'toggle');
+ BsConfig::registerVar('MW::Blog::ShowNewEntryField', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-ShowNewEntryField',
'toggle');
// Position of new entry field. Possible values are "top" and
"bottom"
//BsConfig::registerVar('MW::Blog::NewEntryFieldPosition',
'top', BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, $this->mI18N);
BsConfig::registerVar( 'MW::Blog::NewEntryFieldPosition',
'top',
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-blog-pref-NewEntryFieldPosition', 'select' );
// Maximum number of characters befor an entry is automatically
cut
- BsConfig::registerVar('MW::Blog::MaxEntryCharacters', 1000,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-MaxEntryCharacters',
'int');
+ BsConfig::registerVar('MW::Blog::MaxEntryCharacters', 1000,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-MaxEntryCharacters',
'int');
// Defines how images should be rendered. Possible values:
full|thumb|none
//BsConfig::registerVar('MW::Blog::ImageRenderMode', 'thumb',
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, $this->mI18N);
BsConfig::registerVar( 'MW::Blog::ImageRenderMode', 'thumb',
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-blog-pref-ImageRenderMode', 'select' );
@@ -331,11 +329,11 @@
$bMoreInNewWindow = BsConfig::get(
'MW::Blog::MoreInNewWindow' );
$bShowAll = BsConfig::get( 'MW::Blog::ShowAll' );
$bMoreAtEndOfEntry = BsConfig::get(
'MW::Blog::MoreAtEndOfEntry' );
- $iNamespace = BsConfig::get( 'MW::Blog::Ns' );
$bShowNewEntryField = BsConfig::get(
'MW::Blog::ShowNewEntryField' );
$bNewEntryFieldPosition = BsConfig::get(
'MW::Blog::NewEntryFieldPosition' );
$sImageRenderMode = BsConfig::get(
'MW::Blog::ImageRenderMode' );
$iMaxEntryCharacters = BsConfig::get(
'MW::Blog::MaxEntryCharacters' );
+ $iNamespace = NS_BLOG;
// Trackbacks are not supported the way we intend it to be.
From http://www.mediawiki.org/wiki/Manual:$wgUseTrackbacks
// When MediaWiki receives a trackback ping, a box will show up
at the bottom of the article containing a link to the originating page
diff --git a/UEModulePDF/UEModulePDF.class.php
b/UEModulePDF/UEModulePDF.class.php
index 4b092f1..01fee23 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -55,9 +55,6 @@
*/
public function __construct() {
wfProfileIn( 'BS::'.__METHOD__ );
- //global $wgExtensionMessagesFiles;
- //$wgExtensionMessagesFiles['UEModulePDF'] = __DIR__ .
'/UEModulePDF.i18n.php';
-
// Base settings
$this->mExtensionFile = __FILE__;
$this->mExtensionType = EXTTYPE::SPECIALPAGE;
@@ -203,7 +200,7 @@
'URL' => htmlspecialchars(
$oSpecialPage->getLinkUrl( $aCurrentQueryParams ) ),
'TITLE' => wfMsg(
'bs-uemodulepdf-widgetlink-single-no-attachments-title' ),
'CLASSES' => 'bs-uemodulepdf-single',
- 'TEXT' => wfMsg(
'bs-uemodulepdf-widgetlink-single-no-attachments-text' ),
+ 'TEXT' => wfMessage(
'bs-uemodulepdf-widgetlink-single-no-attachments-text' )->plain(),
);
wfRunHooks( 'BSUEModulePDFBeforeCreateWidget', array( $this,
$oSpecialPage, &$aLinks, $aCurrentQueryParams ) );
@@ -212,27 +209,32 @@
$oPdfView->setAutoWrap( '<ul>###CONTENT###</ul>' );
$oPdfView->setTemplate( '<li><a href="{URL}" rel="nofollow"
title="{TITLE}" class="{CLASSES}">{TEXT}</a></li>' );#
- foreach( $aLinks as $sKey => $aData ) {
+ foreach ( $aLinks as $sKey => $aData ) {
$oPdfView->addData( $aData );
}
$aModules[] = $oPdfView;
return true;
}
-
+
public function onSkinTemplateOutputPageBeforeExec(&$skin, &$template){
$aCurrentQueryParams = $this->getRequest()->getValues();
- $sSpecialPageParameter = BsCore::sanitize(
$aCurrentQueryParams['title'], '', BsPARAMTYPE::STRING );
- $oSpecialPage = SpecialPage::getTitleFor(
'UniversalExport',$sSpecialPageParameter );
- if( isset( $aCurrentQueryParams['title'] ) ) unset(
$aCurrentQueryParams['title'] );
+ if ( isset( $aCurrentQueryParams['title'] ) ) {
+ $sTitle = $aCurrentQueryParams['title'];
+ } else {
+ $sTitle = '';
+ }
+ $sSpecialPageParameter = BsCore::sanitize( $sTitle, '',
BsPARAMTYPE::STRING );
+ $oSpecialPage = SpecialPage::getTitleFor( 'UniversalExport',
$sSpecialPageParameter );
+ if ( isset( $aCurrentQueryParams['title'] ) ) unset(
$aCurrentQueryParams['title'] );
$aCurrentQueryParams['ue[module]'] = 'pdf';
$aContentActions = array(
'id' => 'pdf',
'href' => htmlspecialchars( $oSpecialPage->getLinkUrl(
$aCurrentQueryParams ) ),
- 'title' =>
wfMessage('bs-uemodulepdf-widgetlink-single-no-attachments-text')->plain(),
+ 'title' => wfMessage(
'bs-uemodulepdf-widgetlink-single-no-attachments-text' )->plain(),
'text' => ''
);
-
+
$template->data['bs_title_actions'][] = $aContentActions;
return true;
}
diff --git a/VisualEditor/resources/tinymce.startup.js
b/VisualEditor/resources/tinymce.startup.js
index 9ca0ee7..fa5b5fe 100644
--- a/VisualEditor/resources/tinymce.startup.js
+++ b/VisualEditor/resources/tinymce.startup.js
@@ -96,6 +96,7 @@
_editorMode = 'tiny';
$(document).trigger('VisualEditor::instanceShow', [id]);
} else {
+ tinymce.activeEditor.destroy();
tinymce.activeEditor.remove();
_editorMode = 'wiki';
$(document).trigger('VisualEditor::instanceHide', [id]);
--
To view, visit https://gerrit.wikimedia.org/r/89783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf0c68ea9e9f9c89b31caf32ecc0a787e3fceb5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pigpen <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
