[Xoops-svn] SF.net SVN: xoops-svn:[12744] XoopsCore/branches/2.5.x/2.5.8/htdocs/class/ xoopseditor/tinymce

[<be...@us...>]

Revision: 12744
          http://sourceforge.net/p/xoops/svn/12744
Author:   beckmi
Date:     2014-08-27 03:28:51 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
Adding couple of "isset" checks 

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
    XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php	2014-08-27 00:16:22 UTC (rev 12743)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php	2014-08-27 03:28:51 UTC (rev 12744)
@@ -177,7 +177,7 @@
     }
     // Add new image - end
 
-    // Add new catégorie - start
+    // Add new category - start
     if ( !empty($_POST["op"]) && $op == "addcat" ) {
         if (!$GLOBALS["xoopsSecurity"]->check()) {
             redirect_header($current_file . "?target=" . $target, 3, implode("<br />", $GLOBALS["xoopsSecurity"]->getErrors()));
@@ -230,7 +230,7 @@
         }
         redirect_header($current_file . "?target=" . $target, 3,_MD_AM_DBUPDATED);
     }
-    // Add new catégorie - end
+    // Add new category - end
 
     // Update categorie - start
     if ( !empty($_POST["op"]) && $op == "updatecat" ) {

Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php	2014-08-27 00:16:22 UTC (rev 12743)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php	2014-08-27 03:28:51 UTC (rev 12744)
@@ -94,7 +94,7 @@
         }
 
         // get editor language (from ...)
-        if (is_readable(XOOPS_ROOT_PATH . $this->rootpath . '/langs/' . $this->config["language"] . '.js')) {
+        if (isset($this->config["language"]) && is_readable(XOOPS_ROOT_PATH . $this->rootpath . '/langs/' . $this->config["language"] . '.js')) {
             $this->setting["language"] = $this->config["language"];
             $configured[] = "language";
         }
@@ -298,7 +298,7 @@
         static $isTinyMceJsLoaded = false;
 
         $this->init();
-        if (self::$LastOfElementsTinymce!=$this->setting["elements"]) {
+        if (isset($this->setting["elements"]) && self::$LastOfElementsTinymce!=$this->setting["elements"]) {
                 $ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting["elements"]." -->\n"; //debug
 
                 return $ret;