mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Bugfix #3568 - wysiwyg was not being tested for properly. This has been an ongoing

Browse Source 
issue, now resolved. admin and user code need not download wysiwyg js etc -- use
 e_WYSIWYG constant to see if it is enabled.
Also fixed minor popup bug in header/footer (two different issues)
This commit is contained in:
mrpete 2006-12-07 12:59:43 +00:00
parent 583c71d06e
commit 2606079274
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/footer.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/footer.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/footer.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2006-12-05 09:28:02 $ | $Date: 2006-12-07 12:59:43 $
| $Author: mrpete $ | $Author: mrpete $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@ -78,6 +78,8 @@ if (ADMIN == TRUE) {
// //
// B.2 Send footer template // B.2 Send footer template
// //
if(varset($e107_popup)!=1){
if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) { if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
parse_admin($ADMIN_FOOTER); parse_admin($ADMIN_FOOTER);
} }
@ -126,6 +128,8 @@ $rinfo = '';
echo "</table>"; echo "</table>";
} }
} // End of regular-page footer (the above NOT done for popups)
// //
// D Close DB connection. We're done talking to underlying MySQL // D Close DB connection. We're done talking to underlying MySQL
// //

19
e107_admin/header.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2006-12-05 09:28:02 $ | $Date: 2006-12-07 12:59:43 $
| $Author: mrpete $ | $Author: mrpete $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@ -127,7 +127,8 @@ echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? "
echo "<!-- *JS* -->\n"; echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off. // Wysiwyg JS support on or off.
if (/* isset($WYSIWYG) && $WYSIWYG == TRUE && */ check_class($pref['post_html']) && isset($e_wysiwyg) && $e_wysiwyg != "") { // your code should run off e_WYSIWYG
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
require_once(e_HANDLER."tiny_mce/wysiwyg.php"); require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE); define("e_WYSIWYG",TRUE);
echo wysiwyg($e_wysiwyg); echo wysiwyg($e_wysiwyg);
@ -256,9 +257,17 @@ echo "</head>
$sql->db_Mark_Time("End Head, Start Body"); $sql->db_Mark_Time("End Head, Start Body");
// //
// K: (The rest is ignored for popups, which have no menus) [reserved; user mode] // K: (The rest is ignored for popups, which have no menus)
// //
// require $e107_popup =1; to use it as header for popup without menus
if(!isset($e107_popup))
{
$e107_popup = 0;
}
if ($e107_popup != 1) {
// //
// L: (optional) Body JS to disable right clicks [reserved; user mode] // L: (optional) Body JS to disable right clicks [reserved; user mode]
// //
@ -449,5 +458,5 @@ if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
parse_admin($ADMIN_HEADER); parse_admin($ADMIN_HEADER);
} }
$sql->db_Mark_Time('(End: Parse Admin Header)'); $sql->db_Mark_Time('(End: Parse Admin Header)');
}
?> ?>