using hide_sm_attributions instead of hide_sm_attributes

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10723 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index c7c314be113ab775115871b2c0cac579958ffb29..a9bc6118ebd7b53cdbd5ce6035c0aa94bf70ce19 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -333,7 +333,6 @@ $force_username_lowercase = 'false'     if ( !$force_username_lowercase );
 $optional_delimiter = "detect"          if ( !$optional_delimiter );
 $auto_create_special = 'false'          if ( !$auto_create_special );
 $default_use_priority = 'true'          if ( !$default_use_priority );
-$hide_sm_attributions = 'false'         if ( !$hide_sm_attributions );
 $default_use_mdn = 'true'               if ( !$default_use_mdn );
 $delete_folder = 'false'                if ( !$delete_folder );
 $noselect_fix_enable = 'false'          if ( !$noselect_fix_enable );
@@ -352,6 +351,9 @@ $session_name = 'SQMSESSID'             if ( !$session_name );
 $skip_SM_header = 'false'               if ( !$skip_SM_header );
 $default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book);
 
+# since 1.2.0
+$hide_sm_attributions = 'false'         if ( !$hide_sm_attributions );
+
 # since 1.4.0
 $use_smtp_tls= 'false'                  if ( !$use_smtp_tls);
 $smtp_auth_mech = 'none'                if ( !$smtp_auth_mech );

diff --git a/config/config_default.php b/config/config_default.php
index 6cd161050943937433c42e070d0a709bda1fad67..bdaae37a47a641f3d187c3058d96a98c8f9a2671 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -537,6 +537,7 @@ $default_use_priority = true;
  * This option disables display of "created by SquirrelMail developers"
  * strings and provider link
  * @global bool $hide_sm_attributions
+ * @since 1.2.0
  */
 $hide_sm_attributions = false;
 

diff --git a/src/login.php b/src/login.php
index 79aaaa824e5b52c9a2684c90ef50479d1fd28717..974d6a30ce4950a4cbd2120f7f1c912f475ccf97 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -167,8 +167,7 @@ if (isset($org_logo) && $org_logo) {
 }
 
 $sm_attribute_str = '';
-$hide_sm_attributes = false;
-if (isset($hide_sm_attributes) && !$hide_sm_attributes) {
+if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
     $sm_attribute_str = _("SquirrelMail Webmail Application")."<br />\n" .
                         _("By the SquirrelMail Project Team")."<br />\n";
 }