[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: BSPageTemplates: Removed outdated bugfix

2017-08-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371008 )

Change subject: BSPageTemplates: Removed outdated bugfix
..


BSPageTemplates: Removed outdated bugfix

Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.

See 
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file

NEEDS CHERRY-PICK TO REL1_27 AND REL1_23

Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)

Approvals:
  Pwirth: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageTemplates/PageTemplates.class.php 
b/PageTemplates/PageTemplates.class.php
index f89680d..03c20fc 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -76,7 +76,6 @@
 
//Hooks
$this->setHook( 'LinkBegin' );
-   $this->setHook( 'EditPage::showEditForm:initial', 
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
 
@@ -379,20 +378,6 @@
 
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
-   }
-
-   return true;
-   }
-
-   /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
-   function onEditPageShowEditFormInitial( &$oEdit ) {
-   if ( RequestContext::getMain()->getRequest()->getVal( 
'preload', '' ) ) {
-   // TODO MRG (27.09.11 10:28): Put replacement of 
noinclude into core
-   $oEdit->textbox1 = preg_replace( 
'/.*?<\/noinclude>/s', '',  $oEdit->textbox1 );
}
 
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/371008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: BSPageTemplates: Removed outdated bugfix

2017-08-10 Thread Pwirth (Code Review) 
Pwirth has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371008 )

Change subject: BSPageTemplates: Removed outdated bugfix
..

BSPageTemplates: Removed outdated bugfix

Until MW 1.17 '' tags where not stripped ped 'preload' situations.
So a bugfix was implemented. Nowadays this problem is fixed in MW core and
the former bugfix is now a bug.

See 
https://www.mediawiki.org/wiki/Manual:Creating_pages_with_preloaded_text#Loading_the_preload_file

NEEDS CHERRY-PICK TO REL1_27 AND REL1_23

Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
---
M PageTemplates/PageTemplates.class.php
1 file changed, 0 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/08/371008/1

diff --git a/PageTemplates/PageTemplates.class.php 
b/PageTemplates/PageTemplates.class.php
index f89680d..03c20fc 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -76,7 +76,6 @@
 
//Hooks
$this->setHook( 'LinkBegin' );
-   $this->setHook( 'EditPage::showEditForm:initial', 
'onEditPageShowEditFormInitial' );
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
 
@@ -379,20 +378,6 @@
 
if ( !isset( $aQuery['preload'] ) ) {
$aQuery['action'] = 'view';
-   }
-
-   return true;
-   }
-
-   /**
-* Removes noinclude parts from templates
-* @param EditPage $oEdit MediaWiki EditPage object
-* @return bool allow other hooked methods to be executed. Always true.
-*/
-   function onEditPageShowEditFormInitial( &$oEdit ) {
-   if ( RequestContext::getMain()->getRequest()->getVal( 
'preload', '' ) ) {
-   // TODO MRG (27.09.11 10:28): Put replacement of 
noinclude into core
-   $oEdit->textbox1 = preg_replace( 
'/.*?<\/noinclude>/s', '',  $oEdit->textbox1 );
}
 
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/371008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb214ce80d686a5da2fb4788827f80c0859a608
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits