diff options
| author | friendica <info@friendica.com> | 2013-09-29 02:47:58 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-29 02:47:58 -0700 |
| commit | 4f83a1c15205ef132df0ef3dc2cc670e58428e06 (patch) | |
| tree | 9a2a5e7dfc43fb058a4a4f41acdeb7c5d3fb053d | |
| parent | a06f1f95944ffa578296268ecde3d77f42b69229 (diff) | |
| parent | 5a0623299cf97898bfb51c1ed9378afbc03b5cf2 (diff) | |
| download | volse-hubzilla-4f83a1c15205ef132df0ef3dc2cc670e58428e06.tar.gz volse-hubzilla-4f83a1c15205ef132df0ef3dc2cc670e58428e06.tar.bz2 volse-hubzilla-4f83a1c15205ef132df0ef3dc2cc670e58428e06.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/comanche.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/comanche.php b/include/comanche.php index eb0de96c7..42c8e045c 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -1,7 +1,7 @@ <?php /** @file */ require_once('include/security.php'); - +require_once('include/menu.php'); // When editing a webpage - a dropdown is needed to select a page layout // On submit, the pdl_select value (which is the mid of an item with item_restrict = ITEM_PDL) is stored in // the webpage's resource_id, with resource_type 'pdl'. @@ -74,7 +74,7 @@ function comanche_parser(&$a,$s) { function comanche_menu($name) { $a = get_app(); $m = menu_fetch($name,$a->profile['profile_uid'],get_observer_hash()); - return render_menu($m); + return menu_render($m); } function comanche_replace_region($match) { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f3f637996..aef0d2eb6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3367,7 +3367,6 @@ top: 24px; z-index: 99; background: silver; width: 100%; -left: 0; } div#write-pages a { |