[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Check for parent page being a hub earlier in the process.

[Harej (Code Review)]

Harej has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/351095 )

Change subject: Check for parent page being a hub earlier in the process.
......................................................................

Check for parent page being a hub earlier in the process.

What was happening was that pages were being created, *then* it was
checking if the parent was a hub.

Change-Id: I250c2f880471b7299def3b923be1a2556673d568
---
M includes/SpecialCreateHubFeature.php
1 file changed, 13 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/95/351095/1

diff --git a/includes/SpecialCreateHubFeature.php 
b/includes/SpecialCreateHubFeature.php
index 8e20a6a..12d75fc 100644
--- a/includes/SpecialCreateHubFeature.php
+++ b/includes/SpecialCreateHubFeature.php
@@ -116,10 +116,21 @@
         */
        public function onSubmit( array $data ) {
                $collaborationHub = $data['collaborationhub'];
+               $hubTitleObject = Title::newFromText( $collaborationHub );
+
+               // This special page can only be used to create subpages of 
Collaboration
+               // Hubs. This checks if the parent page is one.
+
+               if ( !$hubTitleObject->exists() ) {
+                       return Status::newFatal( 
'collaborationkit-createhubfeature-hubdoesnotexist' );
+               }
+
+               if ( $hubTitleObject->getContentModel() != 
'CollaborationHubContent' ) {
+                       return Status::newFatal( 
'collaborationkit-createhubfeature-hubisnotahub' );
+               }
+
                $featureName = $data['featurename'];
-
                $titleText = $collaborationHub . '/' . $featureName;
-
                $title = Title::newFromText( $titleText );
                if ( !$title ) {
                        return Status::newFatal( 
'collaborationkit-createhubfeature-invalidtitle' );
@@ -197,16 +208,6 @@
 
                if ( $data[ 'icon' ] ) {
                        $newFeature['image'] = $data[ 'icon' ];
-               }
-
-               $hubTitleObject = Title::newFromText( $collaborationHub );
-
-               if ( !$hubTitleObject->exists() ) {
-                       return Status::newFatal( 
'collaborationkit-createhubfeature-hubdoesnotexist' );
-               }
-
-               if ( $hubTitleObject->getContentModel() != 
'CollaborationHubContent' ) {
-                       return Status::newFatal( 
'collaborationkit-createhubfeature-hubisnotahub' );
                }
 
                $hubWikiPageObject = WikiPage::factory( $hubTitleObject );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I250c2f880471b7299def3b923be1a2556673d568
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej <jamesmh...@gmail.com>

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