mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-21 13:11:52 +02: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:53:49 +00:00
parent e8a80d6900
commit 791ef7d776
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_themes/templates/footer_default.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/footer_default.php,v $
| $Revision: 1.2 $
| $Date: 2006-12-05 09:33:20 $
| $Revision: 1.3 $
| $Date: 2006-12-07 12:53:49 $
| $Author: mrpete $
+----------------------------------------------------------------------------+
*/
@ -107,6 +107,8 @@ if(varset($e107_popup)!=1){
echo "</table>";
}
} // End of regular-page footer (the above NOT done for popups)
//
// D Close DB connection. We're done talking to underlying MySQL
//
@ -123,8 +125,6 @@ if(varset($e107_popup)!=1){
$ns->tablerender('Quick Admin Timer',"Results: {$tmp} microseconds");
}
} // End of regular-page footer (the above NOT done for popups)
if ($pref['developer']) {
global $oblev_at_start,$oblev_before_start;
if (ob_get_level() != $oblev_at_start) {

6
e107_themes/templates/header_default.php
View File

@ -6,8 +6,8 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
| $Revision: 1.2 $
| $Date: 2006-12-05 09:33:20 $
| $Revision: 1.3 $
| $Date: 2006-12-07 12:53:49 $
| $Author: mrpete $
+-----------------------------------------------------------------------------------------------+
*/
@ -90,7 +90,7 @@ echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? "
echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off.
if (isset($WYSIWYG) && $WYSIWYG == TRUE && check_class($pref['post_html']) && isset($e_wysiwyg) && $e_wysiwyg != "") {
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE);
echo wysiwyg($e_wysiwyg);