SQL fix and renamed language string fixed

diff --git a/DOCS/lint.sh b/DOCS/lint.sh
index c2b43ca689ea46406f8a90ae0b245ce0d554e224..00c4a2c545218402502edfebac78a36eb112910b 100755 (executable)
--- a/DOCS/lint.sh
+++ b/DOCS/lint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "$0: Analysing PHP scripts for syntax errors (lint) ..."
-LINT=`find -name "*.php" -exec php -l -f {} 2>&1 \; | grep -v "No syntax errors detected in"`
+LINT=`find -type f -name "*.php" -exec php -l -f {} 2>&1 \; | grep -v "No syntax errors detected in"`
 
 if test "${LINT}" != ""; then
        echo "${LINT}"

diff --git a/DOCS/prop-set.sh b/DOCS/prop-set.sh
index 81dfe9145b5d0db97dc3da195d923fa680794401..1df2b4ca7dd928d1a9fbb4d9d157f78cb07eada2 100755 (executable)
--- a/DOCS/prop-set.sh
+++ b/DOCS/prop-set.sh
@@ -13,4 +13,3 @@ find -type f -name "*.png" -exec svn propset svn:mime-type "image/png" {} \;
 find -type f -name "*.gif" -exec svn propset svn:mime-type "image/gif" {} \;
 find -type f -name "*.txt" -exec svn propset svn:mime-type "text/plain" {} \;
 find -type f -name "*.tpl" -exec svn propset svn:mime-type "text/plain" {} \;
-find inc/phpmailer/ -type f -name "*.php" -exec svn propdel svn:keywords {} \;

diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php
index cff162ad9df99e1bac4ea321dc3b2584c7e793c4..e7afcd83e637232c57d688cabda753c6134bfd1c 100644 (file)
--- a/inc/modules/admin/what-repair_gmnu.php
+++ b/inc/modules/admin/what-repair_gmnu.php
@@ -55,7 +55,7 @@ while ($content = SQL_FETCHARRAY($result_fix)) {
        $actions[] = $content['action'];
 
        // Fix weight
-       $result_sort = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`='%s WHERE `id`=%s' LIMIT 1",
+       $result_sort = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`=%s WHERE `id`=%s LIMIT 1",
                array($cnt, $content['id']), __FILE__, __LINE__);
 
        // Get updated rows

diff --git a/templates/de/html/admin/admin_edit_admin_menu_row.tpl b/templates/de/html/admin/admin_edit_admin_menu_row.tpl
index 4879ea5cd6364d71c1b19d4bf117c10f1d90a35a..95ab588ab6dd61aed4170ed5dcaf7a1520fea641 100644 (file)
--- a/templates/de/html/admin/admin_edit_admin_menu_row.tpl
+++ b/templates/de/html/admin/admin_edit_admin_menu_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td colspan="2" class="admin_edit {%template,ColorSwitch%}">
-               $content[cnt]. {--ENTRY_MODIFY--}:
+               $content[cnt]. {--ADMIN_ENTRY_MODIFY--}:
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_edit_member_menu_row.tpl b/templates/de/html/admin/admin_edit_member_menu_row.tpl
index cf09a5ac22e2afbdde47d6ed33d4a8fe67e8ac38..8c22607d4bec88e1480febde93ee17257aa8ad19 100644 (file)
--- a/templates/de/html/admin/admin_edit_member_menu_row.tpl
+++ b/templates/de/html/admin/admin_edit_member_menu_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td colspan="2" class="{%template,ColorSwitch%}">
-               $content[cnt]. {--ENTRY_MODIFY--}:
+               $content[cnt]. {--ADMIN_ENTRY_MODIFY--}:
        </td>
 </tr>
 <tr>

diff --git a/templates/de/html/admin/admin_menu_status_row.tpl b/templates/de/html/admin/admin_menu_status_row.tpl
index fe549f5bf4175de921458542f68e27f1b0ba54f6..f9d2d5d02bdc3883a6ea3be3e5d0a7447c0f66d3 100644 (file)
--- a/templates/de/html/admin/admin_menu_status_row.tpl
+++ b/templates/de/html/admin/admin_menu_status_row.tpl
@@ -1,11 +1,17 @@
 <tr>
-       <td width="25%" align="right" class="{%template,ColorSwitch%} bottom">$content[cnt].
-       {--ENTRY_MODIFY--}:&nbsp;&nbsp;
+       <td width="25%" align="right" class="{%template,ColorSwitch%} bottom">
+               $content[cnt]. {--ADMIN_ENTRY_MODIFY--}:
+       </td>
        <td width="25%" class="{%template,ColorSwitch%} bottom">
-       $content[menu] <input type="hidden" name="sel[$content[sel]]"
-               value="$content[menu]"></td>
+               $content[menu]
+               <input type="hidden" name="sel[$content[sel]]" value="$content[menu]" />
+       </td>
        <td width="25%" class="{%template,ColorSwitch%} bottom">
-       {--IS_VISIBLE--}&nbsp; $content[visible]</td>
+               {--IS_VISIBLE--}:
+               $content[visible]
+               </td>
        <td width="25%" class="{%template,ColorSwitch%} bottom">
-       {--IS_LOCKED--}&nbsp; $content[locked]</td>
-</tr>
\ No newline at end of file
+               {--IS_LOCKED--}:
+               $content[locked]
+       </td>
+</tr>