cvs: phpdoc /scripts/online_editor editxml.php
| From: | Philip Olson | Date: | Thu, 02 Oct 2008 02:27:09 +0000 |
| Subject: | cvs: phpdoc /scripts/online_editor editxml.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2190@lists.php.net to get a copy of this message | ||
philip Thu Oct 2 02:27:09 2008 UTC
Modified files:
/phpdoc/scripts/online_editor editxml.php
Log:
more E_NOTICE updates and related logic
http://cvs.php.net/viewvc.cgi/phpdoc/scripts/online_editor/editxml.php?r1=1.8&r2=1.9&diff_format=u
Index: phpdoc/scripts/online_editor/editxml.php
diff -u phpdoc/scripts/online_editor/editxml.php:1.8 phpdoc/scripts/online_editor/editxml.php:1.9
--- phpdoc/scripts/online_editor/editxml.php:1.8 Thu Oct 2 02:09:51 2008
+++ phpdoc/scripts/online_editor/editxml.php Thu Oct 2 02:27:09 2008
@@ -60,21 +60,21 @@
// Turn on/off XML as Text
if (!empty($_REQUEST['textedit']) &&
$_REQUEST['textedit']!='false') {
$_SESSION['textedit'] = true;
-} elseif ($_REQUEST['textedit']=='false') {
+} else {
$_SESSION['textedit'] = false;
}
// Turn on/off Hiding XML tags when editing
if (!empty($_REQUEST['hidexml']) &&
$_REQUEST['hidexml']!='false') {
$_SESSION['hidexml'] = true;
-} elseif ($_REQUEST['hidexml']=='false') {
+} else {
$_SESSION['hidexml'] = false;
}
// Turn on/off Line By Line
if (!empty($_REQUEST['par']) && $_REQUEST['par']!='false') {
$_SESSION['para'] = false;
-} elseif ($_REQUEST['par']=='false') {
+} else {
$_SESSION['para'] = true;
}
@@ -266,7 +266,7 @@
}
}
-if ($_SESSION['para'] && $updated) {
+if (!empty($_SESSION['para']) && !empty($updated)) {
// Remove \r (some browsers)
$newdata = str_replace("\r\n", "\r", $newdata);
$newdata = str_replace("\n", "\r", $newdata);
@@ -298,7 +298,7 @@
//------- Save or Send file when requested
-if ($updated || $_REQUEST['download']) {
+if (!empty($updated) || !empty($_REQUEST['download'])) {
// Charset for new translated files
if ($phpdocLangs[$lang]['charset']!='iso-8859-1') {
@@ -340,7 +340,7 @@
if (empty($_SESSION['textedit'])) {
// Mark XML Tags to be hidden (when hidexml is true)
- $hideXMLTag = $_SESSION['hidexml'];
+ $hideXMLTag = empty($_SESSION['hidexml']) ? '' :
$_SESSION['hidexml'];
$startXMLTag = '';
$endXMLTag = '';