projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1334dc)
self::base_get() moved in the proper place
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Tue, 4 Dec 2012 10:29:09 +0000 (11:29 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Tue, 4 Dec 2012 10:29:09 +0000 (11:29 +0100)
web/Obj/transports.phh patch | blob | history
web/Obj/user.phh patch | blob | history

diff --git a/web/Obj/transports.phh b/web/Obj/transports.phh
index 08ad7a0..92f11b4 100644 (file)
--- a/web/Obj/transports.phh
+++ b/web/Obj/transports.phh
@@ -31,7 +31,7 @@ class Transport_template {
     {
     }
 
-    static function fini($init_string, $blockerr)
+    static function fini($init_string, $base, $blockerr)
     {
     }
 
@@ -57,7 +57,7 @@ class Transport_xhr {
         return ($ret);
     }
 
-    static function fini($init_string, $blockerr)
+    static function fini($init_string, $base, $blockerr)
     {
         return ("");
     }
@@ -101,7 +101,7 @@ window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming.
         return ($ret);
     }
 
-    static function fini($init_string, $blockerr)
+    static function fini($init_string, $base, $blockerr)
     {
         $ret = "";
         $ret .= sprintf("<html>
@@ -109,7 +109,7 @@ window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming.
 <script type=\"text/javascript\" src=\"%scommons.js\"></script>
 <script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js\"></script>
 <script type=\"text/javascript\">
-var xynt_streaming = \"ready\";", self::base_get(), self::base_get());
+var xynt_streaming = \"ready\";", $base, $base);
         $ret .= sprintf("
 window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming.reload(); } };
 </script>
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index d3aaf85..a770964 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -653,7 +653,7 @@ class User {
 
     // FIXME: dynamic "Transport_" type
     $tans_class = "Transport_iframe";
-    $body = $tans_class::fini($init_string, static::blocking_error($is_unrecoverable));
+    $body = $tans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable));
 
     // ELSE IF XHR THEN:
     // return (static::blocking_error($is_unrecoverable));
Brisk - briscola chiamata in salsa Ajax: sources.