aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-11-03 15:14:33 -0700
committerFriendika <info@friendika.com>2011-11-03 15:14:33 -0700
commit4f4b03367aafc8efd36cf73ecab58cdd26802757 (patch)
tree4c3fecdf355e25312138c70d80e9a19ec4233afe
parent35305fb6d9bec0129e539a1c52e2729e8f9a1f50 (diff)
downloadvolse-hubzilla-4f4b03367aafc8efd36cf73ecab58cdd26802757.tar.gz
volse-hubzilla-4f4b03367aafc8efd36cf73ecab58cdd26802757.tar.bz2
volse-hubzilla-4f4b03367aafc8efd36cf73ecab58cdd26802757.zip
plugin check returning 0 vs false
-rw-r--r--boot.php2
-rw-r--r--mod/admin.php2
-rw-r--r--mod/profiles.php2
-rw-r--r--view/nav.tpl11
4 files changed, 4 insertions, 13 deletions
diff --git a/boot.php b/boot.php
index 9932f0430..1c0328fb8 100644
--- 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 f178e67f6..c4bb70056 100644
--- 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 a5096a984..ccd7d5474 100644
--- 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 16aa99cb3..d0c640db1 100644
--- 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">