plugin check returning 0 vs false

diff --git a/boot.php b/boot.php
index 9932f0430ad6b5068e4f5ecc66924f9bb18a3669..1c0328fb83521e6c8ab525e22dfe76bc842789e7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1153' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1154' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1101      );
 

diff --git a/mod/admin.php b/mod/admin.php
index f178e67f612587dbd2727e195696914a377d92fa..c4bb70056642692884d3c2c6c8775b18f397c06e 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -506,7 +506,7 @@ function admin_page_plugins(&$a){
                if (x($_GET,"a") && $_GET['a']=="t"){
                        // Toggle plugin status
                        $idx = array_search($plugin, $a->plugins);
-                       if ($idx){
+                       if ($idx !== false){
                                unset($a->plugins[$idx]);
                                uninstall_plugin($plugin);
                                info( sprintf( t("Plugin %s disabled."), $plugin ) );

diff --git a/mod/profiles.php b/mod/profiles.php
index a5096a9846c9e599600f8272c07d74de005a21d6..ccd7d54741af192aed688c4449182d6d158aaf42 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -458,7 +458,7 @@ function profiles_content(&$a) {
 
                        $tpl_header = get_markup_template('profile_listing_header.tpl');
                        $o .= replace_macros($tpl_header,array(
-                               '$header' => t('Profiles'),
+                               '$header' => t('Edit/Manage Profiles'),
                                '$chg_photo' => t('Change profile photo'),
                                '$cr_new' => t('Create New Profile')
                        ));

diff --git a/view/nav.tpl b/view/nav.tpl
index 16aa99cb3ba190d8b645913325dfb8a61ead8c02..d0c640db1587e157ac3a38a5e1385d9694849be8 100644 (file)
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -47,16 +47,7 @@
                                        <li class="empty">$emptynotifications</li>
                                </ul>
                        </li>           
-               {{ endif }}
-
-
-
-               
-       
-
-
-               
-               
+               {{ endif }}             
                
                <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
                        <ul id="nav-site-menu" class="menu-popup">