Display correctly the error message when nothing is retrieved from OCS servers

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 654c5e0527b511af36a97a6593a6eee1314f9061..072fd236fee18a70d5186a78d08febb4026e244a 100644 (file)
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -108,6 +108,7 @@ class OC_OCSClient{
 
                $xml=@file_get_contents($url);
                if($xml==FALSE){
+                       OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
                        return NULL;
                }
                $data=simplexml_load_string($xml);
@@ -143,6 +144,7 @@ class OC_OCSClient{
                $kbe=array();
                $xml=@file_get_contents($url);
                if($xml==FALSE){
+                       OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL);
                        return NULL;
                }
                $data=simplexml_load_string($xml);

diff --git a/settings/templates/help.php b/settings/templates/help.php
index 4e3cdd7b908cdc68d0167c3f474770703453812e..754bf8b6376d84357acd7e4691368cb76bbe4222 100644 (file)
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -9,7 +9,10 @@
        <?php
                $url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
                $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
-               $pageNavi->printPage();
+               if($pageNavi)
+               {
+                       $pageNavi->printPage();
+               }
        ?>
 </diV>
 <?php if(is_null($_["kbe"])):?>