never use profile_load outside of a module's _init() function

diff --git a/boot.php b/boot.php
index 864cdedd32fdc2af9e005557bbae109f5ed8ea85..b19f0aa963169244dd3f4e78570400c2dc96cc79 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1107,6 +1107,10 @@ if(! function_exists('get_max_import_size')) {
  * Profile information is placed in the App structure for later retrieval.
  * Honours the owner's chosen theme for display.
  *
+ * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
+ * the theme is chosen before the _init() function of a theme is run, which will usually
+ * load a lot of theme-specific content
+ *
  */
 
 if(! function_exists('profile_load')) {
@@ -1185,6 +1189,8 @@ if(! function_exists('profile_load')) {
                 * load/reload current theme info
                 */
 
+               set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
+
                $theme_info_file = "view/theme/".current_theme()."/theme.php";
                if (file_exists($theme_info_file)){
                        require_once($theme_info_file);

diff --git a/mod/display.php b/mod/display.php
index 32c4bcae9f8e6cafeb9cb8ce164a8399ee0c7c01..2e0b8216a4a7fc09316522177001aba54cef5f7d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,13 +1,22 @@
 <?php
 
 
-function display_content(&$a, $update = 0) {
+function display_init(&$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
+               killme();
                return;
        }
 
+       $nick = (($a->argc > 1) ? $a->argv[1] : '');
+       profile_load($a,$nick);
+
+}
+
+
+function display_content(&$a, $update = 0) {
+
        require_once("include/bbcode.php");
        require_once('include/security.php');
        require_once('include/conversation.php');
@@ -25,7 +34,6 @@ function display_content(&$a, $update = 0) {
        else {
                $nick = (($a->argc > 1) ? $a->argv[1] : '');
        }
-       profile_load($a,$nick);
 
        if($update) {
                $item_id = $_REQUEST['item_id'];

diff --git a/mod/profile.php b/mod/profile.php
index 9e9af19834c0b6c89429cdfeb8b73ae9bd60e964..25871c24059d3c77cf3dd0062eeed152014dd668 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,7 +33,6 @@ function profile_init(&$a) {
                auto_redir($a, $which);
        }
 
-       set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
        profile_load($a,$which,$profile);
 
        $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);

diff --git a/mod/profiles.php b/mod/profiles.php
index eaa603a282bf537fbdebe9719969199078b98df4..1fc1f484a3035e0043c6b9ef86a5d8df01a73cb5 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,147 @@
 <?php
 
 
+function profiles_init(&$a) {
+
+       nav_set_selected('profiles');
+
+       if(! local_user()) {
+               notice( t('Permission denied.') . EOL);
+               killme();
+               return;
+       }
+
+       if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+               $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
+               );
+               if(! count($r)) {
+                       notice( t('Profile not found.') . EOL);
+                       goaway($a->get_baseurl(true) . '/profiles');
+                       return; // NOTREACHED
+               }
+               
+               check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+
+               // move every contact using this profile as their default to the user default
+
+               $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
+                       intval(local_user()),
+                       intval($a->argv[2]),
+                       intval(local_user())
+               );
+               $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
+               );
+               if($r)
+                       info( t('Profile deleted.') . EOL);
+
+               goaway($a->get_baseurl(true) . '/profiles');
+               return; // NOTREACHED
+       }
+
+
+
+
+
+       if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+               
+               check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+
+               $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+                       intval(local_user()));
+               $num_profiles = count($r0);
+
+               $name = t('Profile-') . ($num_profiles + 1);
+
+               $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+                       intval(local_user()));
+               
+               $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
+                       VALUES ( %d, '%s', '%s', '%s', '%s' )",
+                       intval(local_user()),
+                       dbesc($name),
+                       dbesc($r1[0]['name']),
+                       dbesc($r1[0]['photo']),
+                       dbesc($r1[0]['thumb'])
+               );
+
+               $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+                       intval(local_user()),
+                       dbesc($name)
+               );
+
+               info( t('New profile created.') . EOL);
+               if(count($r3) == 1)
+                       goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+               
+               goaway($a->get_baseurl(true) . '/profiles');
+       } 
+
+       if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+               
+               check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+
+               $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+                       intval(local_user()));
+               $num_profiles = count($r0);
+
+               $name = t('Profile-') . ($num_profiles + 1);
+               $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                       intval(local_user()),
+                       intval($a->argv[2])
+               );
+               if(! count($r1)) {
+                       notice( t('Profile unavailable to clone.') . EOL);
+                       killme();
+                       return;
+               }
+               unset($r1[0]['id']);
+               $r1[0]['is-default'] = 0;
+               $r1[0]['publish'] = 0;  
+               $r1[0]['net-publish'] = 0;      
+               $r1[0]['profile-name'] = dbesc($name);
+
+               dbesc_array($r1[0]);
+
+               $r2 = dbq("INSERT INTO `profile` (`" 
+                       . implode("`, `", array_keys($r1[0])) 
+                       . "`) VALUES ('" 
+                       . implode("', '", array_values($r1[0])) 
+                       . "')" );
+
+               $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
+                       intval(local_user()),
+                       dbesc($name)
+               );
+               info( t('New profile created.') . EOL);
+               if(count($r3) == 1)
+                       goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
+               
+               goaway($a->get_baseurl(true) . '/profiles');
+               
+               return; // NOTREACHED
+       }
+
+
+       if(($a->argc > 1) && (intval($a->argv[1]))) {
+               $r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($a->argv[1]),
+                       intval(local_user())
+               );
+               if(! count($r)) {
+                       notice( t('Profile not found.') . EOL);
+                       killme();
+                       return;
+               }
+
+               profile_load($a,$a->user['nickname'],$r[0]['id']);
+       }
+
+}
+
 function profiles_post(&$a) {
 
        if(! local_user()) {
@@ -425,126 +566,6 @@ function profile_activity($changed, $value) {
 function profiles_content(&$a) {
 
        $o = '';
-       nav_set_selected('profiles');
-
-       if(! local_user()) {
-               notice( t('Permission denied.') . EOL);
-               return;
-       }
-
-       if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
-               $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
-                       intval($a->argv[2]),
-                       intval(local_user())
-               );
-               if(! count($r)) {
-                       notice( t('Profile not found.') . EOL);
-                       goaway($a->get_baseurl(true) . '/profiles');
-                       return; // NOTREACHED
-               }
-               
-               check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
-
-               // move every contact using this profile as their default to the user default
-
-               $r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
-                       intval(local_user()),
-                       intval($a->argv[2]),
-                       intval(local_user())
-               );
-               $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($a->argv[2]),
-                       intval(local_user())
-               );
-               if($r)
-                       info( t('Profile deleted.') . EOL);
-
-               goaway($a->get_baseurl(true) . '/profiles');
-               return; // NOTREACHED
-       }
-
-
-
-
-
-       if(($a->argc > 1) && ($a->argv[1] === 'new')) {
-               
-               check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
-
-               $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-                       intval(local_user()));
-               $num_profiles = count($r0);
-
-               $name = t('Profile-') . ($num_profiles + 1);
-
-               $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-                       intval(local_user()));
-               
-               $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
-                       VALUES ( %d, '%s', '%s', '%s', '%s' )",
-                       intval(local_user()),
-                       dbesc($name),
-                       dbesc($r1[0]['name']),
-                       dbesc($r1[0]['photo']),
-                       dbesc($r1[0]['thumb'])
-               );
-
-               $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
-                       intval(local_user()),
-                       dbesc($name)
-               );
-
-               info( t('New profile created.') . EOL);
-               if(count($r3) == 1)
-                       goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-               
-               goaway($a->get_baseurl(true) . '/profiles');
-       } 
-
-       if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
-               
-               check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
-
-               $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
-                       intval(local_user()));
-               $num_profiles = count($r0);
-
-               $name = t('Profile-') . ($num_profiles + 1);
-               $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                       intval(local_user()),
-                       intval($a->argv[2])
-               );
-               if(! count($r1)) {
-                       notice( t('Profile unavailable to clone.') . EOL);
-                       return;
-               }
-               unset($r1[0]['id']);
-               $r1[0]['is-default'] = 0;
-               $r1[0]['publish'] = 0;  
-               $r1[0]['net-publish'] = 0;      
-               $r1[0]['profile-name'] = dbesc($name);
-
-               dbesc_array($r1[0]);
-
-               $r2 = dbq("INSERT INTO `profile` (`" 
-                       . implode("`, `", array_keys($r1[0])) 
-                       . "`) VALUES ('" 
-                       . implode("', '", array_values($r1[0])) 
-                       . "')" );
-
-               $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
-                       intval(local_user()),
-                       dbesc($name)
-               );
-               info( t('New profile created.') . EOL);
-               if(count($r3) == 1)
-                       goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
-               
-               goaway($a->get_baseurl(true) . '/profiles');
-               
-               return; // NOTREACHED
-       }
-
 
        if(($a->argc > 1) && (intval($a->argv[1]))) {
                $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -556,8 +577,6 @@ function profiles_content(&$a) {
                        return;
                }
 
-               profile_load($a,$a->user['nickname'],$r[0]['id']);
-
                require_once('include/profile_selectors.php');
 
 

diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
index 356a1b71cbe3098cded11d80fb4a16a8ab5b737a..37ba15ce0ac86168803741fc670539823d76f058 100644 (file)
--- a/view/theme/cleanzero/theme.php
+++ b/view/theme/cleanzero/theme.php
@@ -5,12 +5,13 @@
  * Version:
  * Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
  */
+
+function cleanzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function cleanzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 

diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
index 4e5fd0d0e9b7745a86b480ac73ba61220d1d7250..f4781b08f0c9c5219a282521459119a0545270ed 100644 (file)
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
@@ -8,6 +8,7 @@
  */
 
 
+function comix_plain_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
@@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+

diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
index ce28ebf18938180190b935c98322fa8726210a95..da195f267ab513d49d84fef765b8a6298334f495 100644 (file)
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
@@ -8,6 +8,7 @@
  */
 
 
+function comix_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
@@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+

diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
index ecd14da772ed017523d2bfe1df054545ae782298..475d4e63ce93126491a23d6ae4edfadcbd0535ff 100644 (file)
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
@@ -7,6 +7,7 @@
  */
 
 
+function darkbubble_init(&$a) {
 $a->theme_info = array(
   'extends' => 'testbubble',
 );
@@ -21,3 +22,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 });
 </script>
 EOT;
+}

diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 211c552c51713b073329c958ac31374cbbcff583..ee227109b192b0e451be27097e10752cc47c7f8a 100644 (file)
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -7,11 +7,11 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  */
 
+function darkzero_NS_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
-function darkzero_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
@@ -94,4 +94,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+}

diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index ceafdf59569571a7cbf4354b3b34bffaf5cdc0d1..1fe4bf859cd84d42bc93f454ae80396c0b09f44f 100644 (file)
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -8,12 +8,12 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
+function darkzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function darkzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 3bb7c44aa6a7e39efa8c567ff7e7234e4b52f06d..1ec98e877a0c580de54f3b78ae69b86ca8e71954 100644 (file)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
  * Author:
  */
 
-$a = get_app();
-set_template_engine($a, 'smarty3');
-
 function get_diabook_config($key, $default = false) {
        if (local_user()) {
                $result = get_pconfig(local_user(), "diabook", $key);
@@ -26,6 +23,8 @@ function get_diabook_config($key, $default = false) {
 
 function diabook_init(&$a) {
 
+set_template_engine($a, 'smarty3');
+
 //print diabook-version for debugging
 $diabook_version = "Diabook (Version: 1.027)";
 $a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_version);

diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index 21d27f75ee7c743bc39099c2a8a50c44cd3914ab..090df1af2a80bc6b20aa90edaa1ca8675a8fd3fe 100644 (file)
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -8,14 +8,13 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-    'name' => 'dark',
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_dark_init(&$a) {
+       $a->theme_info = array(
+               'family' => 'dispy',
+               'name' => 'dark',
+       );
+       set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;

diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index f8753ec1aa365d312cb08facbb2afa93c89babd7..7365727c77fd48c741e6446e35ea2c5a74a9088b 100644 (file)
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -8,15 +8,14 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-       'name' => 'light',
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_light_init(&$a) {
 
+       $a->theme_info = array(
+               'family' => 'dispy',
+               'name' => 'light',
+       );
+       set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index a1de5498e6ea68e3fd3d1c244a9c6929ff878ce2..d0b7e19d76960db7e15af45120067a8e9968170d 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -17,15 +17,14 @@
  * or rename to prefix1_function_name (prefix2_function_name), etc.
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-       'version' => '1.2.2'
-);
-set_template_engine($a, 'smarty3');
-
 function dispy_init(&$a) {
 
+       $a->theme_info = array(
+               'family' => 'dispy',
+               'version' => '1.2.2'
+       );
+       set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;

diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
index 338f40cbfbc65ddc755b978eebea1b2776267ba7..35796d10a241f4eae1dc830e3adbbaa92aebe740 100644 (file)
--- a/view/theme/easterbunny/theme.php
+++ b/view/theme/easterbunny/theme.php
@@ -1,4 +1,7 @@
 <?php
+
+function easterbunny_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+}

diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
index ec1ab1c6712807b99e3cd097eb8b7db2b193047d..e7203c66416b5ca17bb09d79ccf672c4681ac02d 100644 (file)
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
@@ -1,4 +1,6 @@
 <?php
+
+function facepark_init(&$a) {
 $a->theme_info = array();
 set_template_engine($a, 'smarty3');
 
@@ -48,3 +50,5 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
+}
+

diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index 09a63c040d20d07a549c89293687e911f4f71fcf..9a3dd1d3e103388d5b57a8d7d15584bea6cb4d3b 100644 (file)
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function greenzero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function greenzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {

diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index fc9d5f91c87888605618095db889c4a13fe95e32..c78e5cccceaab9067024e89c4851c4ccf9cf00c8 100644 (file)
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function purplezero_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function purplezero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {

diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 73d35a1628a966970a05f816a47647c9632a0b8e..989a998064bbc7037c141656f682917f2c3a204c 100644 (file)
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -7,10 +7,10 @@
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
  */
  
+function quattro_init(&$a) {
 $a->theme_info = array();
 set_template_engine($a, 'smarty3');
 
-function quattro_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {

diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index 14d058c7dab0d4ebc9888f459723bf15baebee5b..20a198a3c581d156fb2c4ea2283cbac8ae33556b 100644 (file)
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -1,9 +1,10 @@
 <?php
+
+function slack_NS_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 
-function slack_NS_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {
@@ -86,4 +87,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+}

diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index bc09299794a8d3c883bb900080407376cb02df95..43deb4b8ccebe8590751f5abd749f9e5b3e19c21 100644 (file)
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -1,10 +1,11 @@
 <?php
+
+function slackr_init(&$a) {
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
 set_template_engine($a, 'smarty3');
 
-function slackr_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 1f1ee7327b5ac656256607f9117934c039403da1..0cb6f29e1fb557f42691a116bc22b7e1d2b14132 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -9,11 +9,10 @@
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-$a = get_app();
-$a->theme_info = array();
-set_template_engine($a, 'smarty3');
-
 function smoothly_init(&$a) {
+       $a->theme_info = array();
+       set_template_engine($a, 'smarty3');
+
        $cssFile = null;
        $ssl_state = null;
        $baseurl = $a->get_baseurl($ssl_state);

diff --git a/view/theme/testbubble/theme.php b/view/theme/testbubble/theme.php
index ab5d175fe5ee65102ca8cd3e5c50ef4395424e7c..366a4718cc6986bb2224afa4d149bfa577e3ff62 100644 (file)
--- a/view/theme/testbubble/theme.php
+++ b/view/theme/testbubble/theme.php
@@ -8,6 +8,8 @@
  * Maintainer: Mike Macgirvin <mike@macgirvin.com>
  */
 
+
+function testbubble_init(&$a) {
 set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
@@ -18,3 +20,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 });
 </script>
 EOT;
+}

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 7c0f3d3f8d1b6fa3f3136230564047319179b2c4..7da0731f784d76fd2b48a628c24b7d0b07d91301 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -8,11 +8,11 @@
  * Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
+function vier_init(&$a) {
 set_template_engine($a, 'smarty3');
 
 $a->theme_info = array();
 
-function vier_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
 function insertFormatting(comment,BBcode,id) {