diff --git a/framework/router.class.php b/framework/router.class.php
index d9bb5d1e43..eaa4b64b7d 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -65,11 +65,11 @@ class router extends baseRouter
*/
public function saveError($level, $message, $file, $line)
{
- $errorNO[E_ERROR] = E_ERROR;
- $errorNO[E_PARSE] = E_PARSE;
- $errorNO[E_CORE_ERROR] = E_CORE_ERROR;
- $errorNO[E_USER_ERROR] = E_USER_ERROR;
- if(isset($errorNO[$level]) and $this->config->debug == false) $this->config->debug = true;
+ $fatalLevel[E_ERROR] = E_ERROR;
+ $fatalLevel[E_PARSE] = E_PARSE;
+ $fatalLevel[E_CORE_ERROR] = E_CORE_ERROR;
+ $fatalLevel[E_USER_ERROR] = E_USER_ERROR;
+ if(isset($fatalLevel[$level])) $this->config->debug = true;
parent::saveError($level, $message, $file, $line);
}
}
diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php
index c61491e113..e69d6ce2b9 100755
--- a/module/common/view/kindeditor.html.php
+++ b/module/common/view/kindeditor.html.php
@@ -91,7 +91,11 @@ function initKindeditor(afterInit)
})
}, 10);
}
- if(pasted && placeholderText == '') placeholderText = ' lang->noticePasteImg?>';
+ if(pasted)
+ {
+ if(placeholderText) placeholderText += '
';
+ placeholderText += ' lang->noticePasteImg?>';
+ }
/* Paste in chrome.*/
/* Code reference from http://www.foliotek.com/devblog/copy-images-from-clipboard-in-javascript/. */
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 37f13f3514..22122a9cbb 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -208,7 +208,7 @@
foreach($modules as $moduleId => $module)
{
$actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId");
- echo "