[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9363:a03be439ea66
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a03be439ea66
user: Tom <websitemaster at cogeco.net>
date: Tue Dec 31 18:03:24 2013 -0500
description:
Merged with upstream

diffstat:

 plugins/staticpages/language/english.php        |   1 -
 plugins/staticpages/language/english_utf-8.php  |   1 -
 plugins/staticpages/language/japanese_utf-8.php |   1 -
 public_html/javascript/story_editor.js          |  10 ++++++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r 797565e21872 -r a03be439ea66 plugins/staticpages/language/english.php
--- a/plugins/staticpages/language/english.php	Tue Dec 31 18:01:03 2013 -0500
+++ b/plugins/staticpages/language/english.php	Tue Dec 31 18:03:24 2013 -0500
@@ -105,7 +105,6 @@
     'select_php_free' => 'execute PHP',
     'php_not_activated' => 'The use of PHP in static pages is not activated. Please see the <a href="' . $_CONF['site_url'] . '/docs/english/staticpages.html#php">documentation</a> for details.',
     'printable_format' => 'Printable Format',
-    'edit' => 'Edit',
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
diff -r 797565e21872 -r a03be439ea66 plugins/staticpages/language/english_utf-8.php
--- a/plugins/staticpages/language/english_utf-8.php	Tue Dec 31 18:01:03 2013 -0500
+++ b/plugins/staticpages/language/english_utf-8.php	Tue Dec 31 18:03:24 2013 -0500
@@ -105,7 +105,6 @@
     'select_php_free' => 'execute PHP',
     'php_not_activated' => 'The use of PHP in static pages is not activated. Please see the <a href="' . $_CONF['site_url'] . '/docs/english/staticpages.html#php">documentation</a> for details.',
     'printable_format' => 'Printable Format',
-    'edit' => 'Edit',
     'copy' => 'Copy',
     'limit_results' => 'Limit Results',
     'search' => 'Search',
diff -r 797565e21872 -r a03be439ea66 plugins/staticpages/language/japanese_utf-8.php
--- a/plugins/staticpages/language/japanese_utf-8.php	Tue Dec 31 18:01:03 2013 -0500
+++ b/plugins/staticpages/language/japanese_utf-8.php	Tue Dec 31 18:03:24 2013 -0500
@@ -110,7 +110,6 @@
     'select_php_free' => 'PHPを実行する',
     'php_not_activated' => "静的ページでPHPは使用しない設定になっています。詳細については <a href=\"{$_CONF['site_url']}/docs/japanese/staticpages.html#php\">関連ドキュメント</a> を参ç
§ã—てください。",
     'printable_format' => '印刷用フォーマット',
-    'edit' => '編集',
     'copy' => 'コピー',
     'limit_results' => '絞込検索',
     'search' => '検索',
diff -r 797565e21872 -r a03be439ea66 public_html/javascript/story_editor.js
--- a/public_html/javascript/story_editor.js	Tue Dec 31 18:01:03 2013 -0500
+++ b/public_html/javascript/story_editor.js	Tue Dec 31 18:03:24 2013 -0500
@@ -150,10 +150,12 @@
 
     $(function() {
         var elem = document.getElementById('sel_editmode');
-        if (elem.addEventListener) {
-          elem.addEventListener('change', modifyNavlist, false);
-        } else if (elem.attachEvent) {
-          elem.attachEvent('onchange', modifyNavlist);
+        if (elem) {
+            if (elem.addEventListener) {
+                elem.addEventListener('change', modifyNavlist, false);
+            } else if (elem.attachEvent) {
+                elem.attachEvent('onchange', modifyNavlist);
+            }
         }
         function modifyNavlist() {
             var navlistcount = document.getElementById('navlist').getElementsByTagName('li').length;