aboutsummaryrefslogtreecommitdiffstats
path: root/view/php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
commit0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch)
treea92197de4503ec52889dc05483493f4df1a305b8 /view/php
parent99d9456b3addc651a68874ddd391d25684252c4d (diff)
parentb4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff)
downloadvolse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'view/php')
-rw-r--r--view/php/choklet.php2
-rw-r--r--view/php/default.php2
-rw-r--r--view/php/full.php2
-rw-r--r--view/php/minimal.php2
-rw-r--r--view/php/mod_import.php2
-rw-r--r--view/php/redable.php2
-rw-r--r--view/php/theme_init.php2
7 files changed, 7 insertions, 7 deletions
diff --git a/view/php/choklet.php b/view/php/choklet.php
index 5f2303e77..00f8a6c56 100644
--- a/view/php/choklet.php
+++ b/view/php/choklet.php
@@ -2,7 +2,7 @@
<html prefix="og: http://ogp.me/ns#">
<head>
<title><?php if(x($page,'title')) echo $page['title']; ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl(); ?>";</script>
+ <script>var baseurl="<?php echo z_root(); ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/php/default.php b/view/php/default.php
index 4a7c1ea19..ad6b7a3d1 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -2,7 +2,7 @@
<html prefix="og: http://ogp.me/ns#">
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <script>var baseurl="<?php echo z_root() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/php/full.php b/view/php/full.php
index bc3b2ed87..9cf567a67 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -2,7 +2,7 @@
<html prefix="og: http://ogp.me/ns#">
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <script>var baseurl="<?php echo z_root() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/php/minimal.php b/view/php/minimal.php
index ade2a0cb7..3572f3b5c 100644
--- a/view/php/minimal.php
+++ b/view/php/minimal.php
@@ -2,7 +2,7 @@
<html prefix="og: http://ogp.me/ns#">
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <script>var baseurl="<?php echo z_root() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/php/mod_import.php b/view/php/mod_import.php
index 1ca2866bc..56c4eff86 100644
--- a/view/php/mod_import.php
+++ b/view/php/mod_import.php
@@ -1,2 +1,2 @@
<?php
-$a->page['template'] = 'full';
+App::$page['template'] = 'full';
diff --git a/view/php/redable.php b/view/php/redable.php
index 0dcba77d2..a5110e0dc 100644
--- a/view/php/redable.php
+++ b/view/php/redable.php
@@ -2,7 +2,7 @@
<html prefix="og: http://ogp.me/ns#">
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+ <script>var baseurl="<?php echo z_root() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 7c714ecd2..648b144b3 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -53,6 +53,6 @@ head_add_js('library/imagesloaded/imagesloaded.pkgd.min.js');
* more of a proof of concept; but sufficient for our immediate needs.
*/
-$channel = get_app()->get_channel();
+$channel = App::get_channel();
if($channel && file_exists($channel['channel_address'] . '.js'))
head_add_js('/' . $channel['channel_address'] . '.js');