Changeset 1596

Timestamp:

06/07/08 00:56:18 (6 months ago)

Author:

dramirez

Message:

Fixed some warnings related to the templates_js_context functions

Files:

• devel/lib/setup.php (modified) (2 diffs)
• devel/lib/templates.php (modified) (2 diffs)

devel/lib/setup.php

@@ -7 +7 @@
-global $SESSION;
-global $PAGE;
+global $js_files;
-
-/// First try to detect some attacks on older buggy PHP versions
@@ -426 +427 @@
-if (!isset($PAGE->menu_top   )) { $PAGE->menu_top    = array();}
-if (!isset($PAGE->menu_bottom)) { $PAGE->menu_bottom = array();}
+if (!isset($PAGE->js_setup   )) { $PAGE->js_setup = array();}
+
+// Setting up global.js for make available ELGG_WWWROOT for JavaScript
+if(!isset($js_files)){
+  $js_files = array();
+  $js_files['global'][]=array("path"=>"lib/global.js","external"=>false);
+}
-
-//

devel/lib/templates.php

@@ -1299 +1299 @@
-  global $CFG,$js_files;
-
-  if(!isset($js_files)){
-    $js_files = array();
-    $js_files['global'][]=array("path"=>"lib/global.js","external"=>false);
-  }
-
-  if(!empty($context)){
-    if(!array_key_exists($context,$js_files)||$overwrite){
@@ -1321 +1316 @@
-function templates_js_setup($context="global"){
-  global $CFG,$PAGE,$js_files,$metatags;
-
+
+
-  if(!$PAGE->js_setup[$context]){
-    $inlinefiles = null;