Robert Vogel has submitted this change and it was merged.

Change subject: Fixed Fatal for non-object
......................................................................


Fixed Fatal for non-object

Needs cherry-pick to REL1_23

Change-Id: I4ea5ec47e87e68b1106d72004910be5bcf89e77c
---
M includes/utility/PageContentProvider.class.php
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/includes/utility/PageContentProvider.class.php 
b/includes/utility/PageContentProvider.class.php
index 6cef76b..eca3a07 100644
--- a/includes/utility/PageContentProvider.class.php
+++ b/includes/utility/PageContentProvider.class.php
@@ -99,8 +99,13 @@
         * @return String Content
         */
        public function getContentFromTitle( Title $oTitle, $iAudience = 
Revision::FOR_PUBLIC, User $oUser = null, $bHTML = false ) {
-               if ( !$oTitle->exists() ) return '';
+               if ( !$oTitle->exists() ) {
+                       return '';
+               }
                $oRevision = Revision::newFromTitle( $oTitle );
+               if ( is_null( $oRevision ) ) {
+                       return '';
+               }
 
                return $this->getContentFromRevision( $oRevision, $iAudience, 
$oUser, $bHTML );
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ea5ec47e87e68b1106d72004910be5bcf89e77c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to